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 di...@apache.org on 2005/10/21 05:45:53 UTC
svn commit: r327087 - in
/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security:
WSDoAllReceiver.java WSDoAllSender.java handler/WSDoAllHandler.java
Author: dims
Date: Thu Oct 20 20:45:48 2005
New Revision: 327087
URL: http://svn.apache.org/viewcvs?rev=327087&view=rev
Log:
Cleanup the setContextClassLoader hack.
Modified:
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java?rev=327087&r1=327086&r2=327087&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java Thu Oct 20 20:45:48 2005
@@ -117,15 +117,6 @@
Document doc = null;
- ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
-
- //Setting the class loader
- if(msgContext.isServerSide()) {
- Thread.currentThread().setContextClassLoader(msgContext.getServiceDescription().getClassLoader());
- } else {
- //Thread.currentThread().setContextClassLoader(msgContext.getClass().getClassLoader());
- }
-
try {
doc = Axis2Util.getDocumentFromSOAPEnvelope(msgContext.getEnvelope());
} catch (WSSecurityException wssEx) {
@@ -180,12 +171,8 @@
checkSignatureConfirmation(reqData, wsResult);
}
- //Setting the original class loader
- Thread.currentThread().setContextClassLoader(originalClassLoader);
-
//TODO: Copy the processed headers
-
-
+
/**
* Set the new SOAPEnvelope
*/
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java?rev=327087&r1=327086&r2=327087&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java Thu Oct 20 20:45:48 2005
@@ -168,16 +168,8 @@
}
- //Setting the class loader
- ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
-
- Thread.currentThread().setContextClassLoader(msgContext.getServiceDescription().getClassLoader());
-
doSenderAction(doAction, doc, reqData, actions, !msgContext.isServerSide());
- //Setting the original class loader
- Thread.currentThread().setContextClassLoader(originalClassLoader);
-
/*
* If required convert the resulting document into a message first.
* The outputDOM() method performs the necessary c14n call. After
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java?rev=327087&r1=327086&r2=327087&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java Thu Oct 20 20:45:48 2005
@@ -211,4 +211,16 @@
((MessageContext)msgContext).setProperty(key, value);
}
+ /**
+ * override the class loader used to load the PW callback class
+ * @return class loader
+ */
+ public java.lang.ClassLoader getClassLoader() {
+ try {
+ MessageContext msgContext = (MessageContext) this.reqData.getMsgContext();
+ return msgContext.getServiceDescription().getClassLoader();
+ } catch (Throwable t) {
+ return super.getClassLoader();
+ }
+ }
}