Skip to content

Commit

Permalink
Fixed recent and old NPEs
Browse files Browse the repository at this point in the history 
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
  • Loading branch information
@dmatej
dmatej committed Sep 18, 2022
1 parent 7a63886 commit 45f02a0
Show file tree
Hide file tree
Showing 5 changed files with 123 additions and 113 deletions.
174 changes: 90 additions & 84 deletions ...on/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/RegistrationSupport.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2022 Contributors to the Eclipse Foundation
* Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -34,22 +35,44 @@
import com.sun.enterprise.deployment.WebComponentDescriptor;
import com.sun.enterprise.deployment.archivist.Archivist;
import com.sun.enterprise.deployment.archivist.ArchivistFactory;
import com.sun.enterprise.deployment.core.*;
import com.sun.enterprise.deployment.io.DeploymentDescriptorFile;

import java.io.ByteArrayOutputStream;
import java.lang.reflect.Constructor;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.management.*;

import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.MBeanServerNotification;
import javax.management.Notification;
import javax.management.NotificationListener;
import javax.management.ObjectName;

import org.glassfish.admin.amx.core.Util;
import org.glassfish.admin.amx.impl.config.ConfigBeanRegistry;
import org.glassfish.admin.amx.impl.j2ee.loader.J2EEInjectedValues;
import org.glassfish.admin.amx.impl.util.InjectedValues;
import org.glassfish.admin.amx.impl.util.ObjectNameBuilder;
import org.glassfish.admin.amx.j2ee.*;
import org.glassfish.admin.amx.j2ee.AMXEELoggerInfo;
import org.glassfish.admin.amx.j2ee.AppClientModule;
import org.glassfish.admin.amx.j2ee.EJB;
import org.glassfish.admin.amx.j2ee.EJBModule;
import org.glassfish.admin.amx.j2ee.EntityBean;
import org.glassfish.admin.amx.j2ee.J2EEApplication;
import org.glassfish.admin.amx.j2ee.J2EEManagedObject;
import org.glassfish.admin.amx.j2ee.J2EEServer;
import org.glassfish.admin.amx.j2ee.MessageDrivenBean;
import org.glassfish.admin.amx.j2ee.ResourceAdapter;
import org.glassfish.admin.amx.j2ee.ResourceAdapterModule;
import org.glassfish.admin.amx.j2ee.Servlet;
import org.glassfish.admin.amx.j2ee.SingletonSessionBean;
import org.glassfish.admin.amx.j2ee.StatefulSessionBean;
import org.glassfish.admin.amx.j2ee.StatelessSessionBean;
import org.glassfish.admin.amx.j2ee.WebModule;
import org.glassfish.admin.amx.util.ClassUtil;
import org.glassfish.admin.amx.util.MapUtil;
import org.glassfish.admin.amx.util.jmx.JMXUtil;
Expand All @@ -60,21 +83,18 @@
import org.jvnet.hk2.config.ConfigBeanProxy;

/**
Handles registrations of resources and applications associated with a J2EEServer.
There must be one and only one of these instances per J2EEServer.
* Handles registrations of resources and applications associated with a J2EEServer.
* There must be one and only one of these instances per J2EEServer.
*/
final class RegistrationSupport
{
private static void cdebug(Object o)
{
System.out.println("" + o);
}
final class RegistrationSupport {

private static final Logger LOG = Logger.getLogger(RegistrationSupport.class.getName());

/**
Associates the ObjectName of a ResourceRef or ApplicationRef with its corresponding
top-level JSR 77 MBean. Children of those JSR 77 MBeans come and go with their parent.
* Associates the ObjectName of a ResourceRef or ApplicationRef with its corresponding
* top-level JSR 77 MBean. Children of those JSR 77 MBeans come and go with their parent.
*/
private final Map<ObjectName, ObjectName> mConfigRefTo77 = new HashMap<ObjectName, ObjectName>();
private final Map<ObjectName, ObjectName> mConfigRefTo77 = new HashMap<>();

private final J2EEServer mJ2EEServer;

Expand All @@ -93,87 +113,80 @@ private static void cdebug(Object o)

private final Logger mLogger = AMXEELoggerInfo.getLogger();

public RegistrationSupport(final J2EEServer server)
{
public RegistrationSupport(final J2EEServer server) {
mJ2EEServer = server;
mMBeanServer = (MBeanServer) server.extra().mbeanServerConnection();

mResourceRefType = Util.deduceType(ResourceRef.class);
mResourceRefType = Util.deduceType(ResourceRef.class);
mApplicationRefType = Util.deduceType(ApplicationRef.class);
mServer = getDomain().getServers().getServer( mJ2EEServer.getName() );
mServer = getDomain().getServers().getServer(mJ2EEServer.getName());

mResourceRefListener = new RefListener();

registerApplications();
}

protected void cleanup()
{

protected void cleanup() {
mResourceRefListener.stopListening();
}

public void start()
{

public void start() {
mResourceRefListener.startListening();
}

/** Maps configuration MBean type to J2EE type */
public static final Map<String, Class> CONFIG_RESOURCE_TYPES =
MapUtil.toMap(new Object[]
{
"jdbc-resource", JDBCResourceImpl.class,
"java-mail-resource", JavaMailResourceImpl.class,
"jca-resource", JCAResourceImpl.class,
"jms-resource", JMSResourceImpl.class,
"jndi-resource", JNDIResourceImpl.class,
"jta-resource", JTAResourceImpl.class,
"rmi-iiop-resource", RMI_IIOPResourceImpl.class,
"url-resource", URLResourceImpl.class
},
String.class, Class.class);

private Domain getDomain()
{
public static final Map<String, Class<? extends J2EEManagedObjectImplBase>> CONFIG_RESOURCE_TYPES = Map.of(
"jdbc-resource", JDBCResourceImpl.class,
"java-mail-resource", JavaMailResourceImpl.class,
"jca-resource", JCAResourceImpl.class,
"jms-resource", JMSResourceImpl.class,
"jndi-resource", JNDIResourceImpl.class,
"jta-resource", JTAResourceImpl.class,
"rmi-iiop-resource", RMI_IIOPResourceImpl.class,
"url-resource", URLResourceImpl.class
);

private Domain getDomain() {
return InjectedValues.getInstance().getHabitat().getService(Domain.class);
}

private ObjectName getObjectName(ConfigBeanProxy cbp)
{

private ObjectName getObjectName(ConfigBeanProxy cbp) {
return ConfigBeanRegistry.getInstance().getObjectNameForProxy(cbp);
}

private String getDeploymentDescriptor(
final BundleDescriptor bundleDesc )
{

private String getDeploymentDescriptor(final BundleDescriptor bundleDesc) {
final ArchivistFactory archivistFactory = J2EEInjectedValues.getInstance().getArchivistFactory();

String dd = "unavailable";
ByteArrayOutputStream out = null;
try
{
final Archivist moduleArchivist = archivistFactory.getArchivist(bundleDesc.getModuleDescriptor().getModuleType());
final DeploymentDescriptorFile ddFile = moduleArchivist.getStandardDDFile();
try {
final Archivist<BundleDescriptor> moduleArchivist = archivistFactory
.getArchivist(bundleDesc.getModuleDescriptor().getModuleType());
final DeploymentDescriptorFile<BundleDescriptor> ddFile = moduleArchivist.getStandardDDFile();

out = new ByteArrayOutputStream();
ddFile.write(bundleDesc, out);
final String charsetName = "UTF-8";
dd = out.toString(charsetName);
}
catch( final Exception e )
{
} catch (final Exception e) {
dd = null;
}
finally
{
if ( out != null )
{
try { out.close(); } catch( Exception ee) {}
} finally {
if (out != null) {
try {
out.close();
} catch (Exception ee) {
}
}
}

return dd;
}


private ObjectName createAppMBeans(
com.sun.enterprise.config.serverbeans.Application appConfig,
final Application application,
Expand Down Expand Up @@ -504,27 +517,25 @@ protected <I extends J2EEManagedObject, C extends J2EEManagedObjectImplBase> Obj


/**
Examine the MBean to see if it is a ResourceRef that should be manifested under this server,
and if so, register a JSR 77 MBean for it.
* Examine the MBean to see if it is a ResourceRef that should be manifested under this server,
* and if so, register a JSR 77 MBean for it.
*/
public ObjectName processResourceRef(final ResourceRef ref)
{
if (ref == null)
{
public ObjectName processResourceRef(final ResourceRef ref) {
if (ref == null) {
throw new IllegalArgumentException("resource-ref is null");
}

if ( ! mServer.getName().equals(ref.getParent(Server.class).getName()))
{
cdebug("ResourceRef is not a child of server " + getObjectName(mServer));
if (!mServer.getName().equals(ref.getParent(Server.class).getName())) {
if (LOG.isLoggable(Level.FINEST)) {
LOG.log(Level.FINEST, "ResourceRef is not a child of server " + getObjectName(mServer));
}
return null;
}

// find the referenced resource
Resource res = null;
List<Resource> resources = getDomain().getResources().getResources();
for (Resource resource : resources)
{
for (Resource resource : resources) {
String name = null;
if (resource instanceof BindableResource) {
name = ((BindableResource) resource).getJndiName();
Expand All @@ -535,45 +546,39 @@ public ObjectName processResourceRef(final ResourceRef ref)
if (resource instanceof ResourcePool) {
name = ((ResourcePool) resource).getName();
}
if (name != null && name.equals(ref.getRef()))
if (name != null && name.equals(ref.getRef())) {
res = resource;
}
}
if (res == null)
{
if (res == null) {
throw new IllegalArgumentException("ResourceRef refers to non-existent resource: " + ref);
}

final String configType = Util.getTypeProp(getObjectName(res));
final Class<J2EEManagedObjectImplBase> implClass = CONFIG_RESOURCE_TYPES.get(configType);
if (implClass == null)
{
final Class<? extends J2EEManagedObjectImplBase> implClass = CONFIG_RESOURCE_TYPES.get(configType);
if (implClass == null) {
mLogger.fine("Unrecognized resource type for JSR 77 purposes: " + getObjectName(res));
return null;
}
final Class<J2EEManagedObject> intf = (Class) ClassUtil.getFieldValue(implClass, "INTF");

ObjectName mbean77 = null;
try
{
try {
final MetadataImpl meta = new MetadataImpl();
meta.setCorrespondingRef(getObjectName(ref));
meta.setCorrespondingConfig(getObjectName(res));

mbean77 = registerJ2EEChild(mJ2EEServer.objectName(), meta, intf, implClass, Util.getNameProp(getObjectName(res)));
synchronized (mConfigRefTo77)
{
mbean77 = registerJ2EEChild(mJ2EEServer.objectName(), meta, intf, implClass,
Util.getNameProp(getObjectName(res)));
synchronized (mConfigRefTo77) {
mConfigRefTo77.put(getObjectName(ref), mbean77);
}
} catch (final Exception e) {
mLogger.log(Level.WARNING, AMXEELoggerInfo.cantRegisterMbean, new Object[] {getObjectName(ref), e});
}
catch (final Exception e)
{
mLogger.log( Level.INFO, AMXEELoggerInfo.cantRegisterMbean, new Object[] { getObjectName(ref), e });
}
//cdebug( "Registered " + child + " for config resource " + amx.objectName() );
return mbean77;
}


/**
Listen for registration/unregistration of {@link ResourceRef},
and associate them with JSR 77 MBeans for this J2EEServer.
Expand All @@ -587,6 +592,7 @@ public RefListener()
{
}

@Override
public void handleNotification(final Notification notifIn, final Object handback)
{
if (!(notifIn instanceof MBeanServerNotification))
Expand Down
2 changes: 1 addition & 1 deletion ...b-container/src/main/java/org/glassfish/ejb/deployment/node/ContainerTransactionNode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void addDescriptor(Object newDescriptor) {

@Override
public ContainerTransaction getDescriptor() {
return new ContainerTransaction(trans_attribute, description);
return null;
}


Expand Down
2 changes: 1 addition & 1 deletion .../ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/RelationshipsNode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public RelationshipsNode() {

@Override
public RelationshipDescriptor getDescriptor() {
return (RelationshipDescriptor) getParentNode().getDescriptor();
return null;
}


Expand Down
4 changes: 3 additions & 1 deletion appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,9 @@ protected WebConnector createHttpListener(NetworkListener listener, HttpService

MappingData md = new MappingData();
try {
mapper.map(host, mb, md);
if (mapper != null) {
mapper.map(host, mb, md);
}
} catch (Exception e) {
if (logger.isLoggable(FINE)) {
logger.log(FINE, "", e);
Expand Down

0 comments on commit 45f02a0

Please sign in to comment.