Author: coheigea
Date: Thu Jan 29 11:27:10 2009
New Revision: 738824
URL: http://svn.apache.org/viewvc?rev=738824&view=rev
Log:
Some minor reshuffling of classloader stuff
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/AbstractCrypto.java
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoFactory.java
webservices/wss4j/trunk/src/org/apache/ws/security/util/Loader.java
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/AbstractCrypto.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/AbstractCrypto.java?rev=738824&r1=738823&r2=738824&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/AbstractCrypto.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/AbstractCrypto.java
Thu Jan 29 11:27:10 2009
@@ -49,7 +49,7 @@
* @param properties
*/
public AbstractCrypto(Properties properties) throws CredentialException,
IOException {
- this(properties, AbstractCrypto.class.getClassLoader());
+ this(properties, Loader.getClassLoader(AbstractCrypto.class));
}
/**
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoFactory.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoFactory.java?rev=738824&r1=738823&r2=738824&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoFactory.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoFactory.java
Thu Jan 29 11:27:10 2009
@@ -173,11 +173,11 @@
cryptoClassName =
properties.getProperty("org.apache.ws.security.crypto.provider",
defaultCryptoClassName);
}
- return loadClass(cryptoClassName, properties,customClassLoader);
+ return loadClass(cryptoClassName, properties, customClassLoader);
}
private static Crypto loadClass(String cryptoClassName, Map map) {
- return
loadClass(cryptoClassName,map,CryptoFactory.class.getClassLoader());
+ return loadClass(cryptoClassName, map,
Loader.getClassLoader(CryptoFactory.class));
}
/**
@@ -236,7 +236,7 @@
* @return a <code>Properties</code> object loaded from the filename
*/
private static Properties getProperties(String propFilename) {
- return getProperties(propFilename,
CryptoFactory.class.getClassLoader());
+ return getProperties(propFilename,
Loader.getClassLoader(CryptoFactory.class));
}
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/util/Loader.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/util/Loader.java?rev=738824&r1=738823&r2=738824&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/util/Loader.java
(original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/util/Loader.java Thu Jan
29 11:27:10 2009
@@ -117,6 +117,16 @@
static public ClassLoader getTCL() throws IllegalAccessException,
InvocationTargetException {
return Thread.currentThread().getContextClassLoader();
}
+
+ /**
+ * Get the class loader of the class argument
+ * <p/>
+ *
+ * @return the class loader of the argument
+ */
+ static public ClassLoader getClassLoader(Class clazz) {
+ return clazz.getClassLoader();
+ }
/**
* Try the specified classloader and then fall back to the loadClass
@@ -138,7 +148,7 @@
} catch (Throwable e) {
log.warn(e.getMessage(), e);
}
- return loadClass(clazz);
+ return loadClass(clazz, true);
}
/**
@@ -154,6 +164,7 @@
static public Class loadClass(String clazz) throws ClassNotFoundException {
return loadClass(clazz, true);
}
+
static public Class loadClass(String clazz, boolean warn) throws
ClassNotFoundException {
try {
ClassLoader tcl = getTCL();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
