You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2008/03/16 21:27:19 UTC

svn commit: r637647 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2: client/Options.java context/AbstractContext.java description/ParameterIncludeImpl.java util/Utils.java

Author: damrhei
Date: Sun Mar 16 13:27:18 2008
New Revision: 637647

URL: http://svn.apache.org/viewvc?rev=637647&view=rev
Log:
Get object classloaders in J2S compliant manner.

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java?rev=637647&r1=637646&r2=637647&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java Sun Mar 16 13:27:18 2008
@@ -39,6 +39,7 @@
 import org.apache.axis2.transport.TransportListener;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.util.MetaDataEntry;
+import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -1640,8 +1641,13 @@
     private void debugPropertySet(String key, Object value) {
         if (DEBUG_ENABLED) {
             String className = (value == null) ? "null" : value.getClass().getName();
-            String classloader = (value == null || value.getClass().getClassLoader() == null)? "null" : 
-                value.getClass().getClassLoader().toString();
+            String classloader = "null";
+            if(value != null) {
+                ClassLoader cl = Utils.getObjectClassLoader(value);
+                if(cl != null) {
+                    classloader = cl.toString();
+                }
+            }
             String valueText = (value instanceof String) ? value.toString() : null;
             
             String identity = getClass().getName() + '@' + 

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java?rev=637647&r1=637646&r2=637647&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java Sun Mar 16 13:27:18 2008
@@ -24,6 +24,7 @@
 import org.apache.axis2.clustering.ClusterManager;
 import org.apache.axis2.clustering.context.Replicator;
 import org.apache.axis2.util.JavaUtils;
+import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -392,8 +393,13 @@
     private void debugPropertySet(String key, Object value) {
         if (DEBUG_ENABLED) {
             String className = (value == null) ? "null" : value.getClass().getName();
-            String classloader = (value == null || value.getClass().getClassLoader() == null) ? "null" : 
-                value.getClass().getClassLoader().toString();
+            String classloader = "null";
+            if(value != null) {
+                ClassLoader cl = Utils.getObjectClassLoader(value);
+                if(cl != null) {
+                    classloader = cl.toString();
+                }
+            }
             String valueText = (value instanceof String) ? value.toString() : null;
             String identity = getClass().getName() + '@' + 
                 Integer.toHexString(System.identityHashCode(this));

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java?rev=637647&r1=637646&r2=637647&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java Sun Mar 16 13:27:18 2008
@@ -29,6 +29,7 @@
 import org.apache.axis2.context.externalize.SafeSerializable;
 import org.apache.axis2.deployment.DeploymentConstants;
 import org.apache.axis2.util.JavaUtils;
+import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -292,8 +293,13 @@
             String key = parameter.getName();
             Object value = parameter.getValue();
             String className = (value == null) ? "null" : value.getClass().getName();
-            String classloader = (value == null || value.getClass().getClassLoader() == null) ? "null" : 
-                value.getClass().getClassLoader().toString();
+            String classloader = "null";
+            if(value != null) {
+                ClassLoader cl = Utils.getObjectClassLoader(value);
+                if(cl != null) {
+                    classloader = cl.toString();
+                }
+            }
             String valueText = (value instanceof String) ? value.toString() : null;
             String identity = getClass().getName() + '@' + 
                 Integer.toHexString(System.identityHashCode(this));

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java?rev=637647&r1=637646&r2=637647&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java Sun Mar 16 13:27:18 2008
@@ -54,6 +54,8 @@
 
 import javax.xml.namespace.QName;
 import java.io.File;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.HashMap;
 import java.util.Iterator;
 
@@ -491,5 +493,22 @@
                     "The MessageContext does not have an associated SOAPFault.");
         }
         return result;
+    }
+    
+    /**
+     * This method will provide the logic needed to retrieve an Object's classloader
+     * in a Java 2 Security compliant manner.
+     */
+    public static ClassLoader getObjectClassLoader(final Object object) {
+        if(object == null) {
+            return null;
+        }
+        else {
+            return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction() {
+                public Object run() {
+                    return object.getClass().getClassLoader();
+                }
+            });
+        }
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org