Author: peter_firmstone Date: Sat Apr 26 14:09:00 2014 New Revision: 1590241
URL: http://svn.apache.org/r1590241 Log: RIVER-336 Minor update to ClassLoading. Be careful with MarshalledObject obtained from ActivationGroupDesc Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/AbstractActivationGroup.java river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/ClassLoading.java Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/AbstractActivationGroup.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/AbstractActivationGroup.java?rev=1590241&r1=1590240&r2=1590241&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/AbstractActivationGroup.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/AbstractActivationGroup.java Sat Apr 26 14:09:00 2014 @@ -224,7 +224,7 @@ abstract class AbstractActivationGroup e /** group is inactive */ private static final int INACTIVE = 4; /** parameter types for activatable constructor */ - private static Class[] paramTypes = { + private final static Class[] paramTypes = { ActivationID.class, MarshalledObject.class }; @@ -382,8 +382,8 @@ abstract class AbstractActivationGroup e private static Configuration getConfiguration(MarshalledObject mobj) throws ConfigurationException, IOException, ClassNotFoundException { - ActivationGroupData data = (ActivationGroupData) - new MarshalledInstance(mobj).get(false); + /* mobj must be MarshalledObject unmarshalled */ + ActivationGroupData data = (ActivationGroupData) mobj.get(); ClassLoader cl = AbstractActivationGroup.class.getClassLoader(); ClassLoader ccl = Thread.currentThread().getContextClassLoader(); if (!covers(cl, ccl)) { Modified: river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/ClassLoading.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/ClassLoading.java?rev=1590241&r1=1590240&r2=1590241&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/ClassLoading.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/ClassLoading.java Sat Apr 26 14:09:00 2014 @@ -175,6 +175,7 @@ public final class ClassLoading { return true; } else if (providerName == null) { provider = null; + logger.log(Level.CONFIG, "loaded: java.rmi.server.RMIClassLoader"); } return false; }
