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 he...@apache.org on 2004/12/10 11:00:17 UTC
svn commit: r111489 - in webservices/axis/trunk/java/dev/scratch/prototype2/src: java/org/apache/axis/description java/org/apache/axis/engine java/org/apache/axis/impl/providers test/org/apache/axis/description
Author: hemapani
Date: Fri Dec 10 02:00:14 2004
New Revision: 111489
URL: http://svn.apache.org/viewcvs?view=rev&rev=111489
Log:
fix the bug in revoke flow
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/AxisGlobal.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Phase.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/AbstractProvider.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/RawXMLProvider.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/AxisGlobal.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/AxisGlobal.java?view=diff&rev=111489&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/AxisGlobal.java&r1=111488&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/AxisGlobal.java&r2=111489
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/AxisGlobal.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/AxisGlobal.java Fri Dec 10 02:00:14 2004
@@ -27,29 +27,10 @@
paramInclude = new ParameterIncludeImpl();
}
- public int hashCode() {
- return paramInclude.hashCode();
- }
-
- public String toString() {
- return paramInclude.toString();
- }
-
- /**
- * @param name
- * @return
- */
public Parameter getParameter(String name) {
return paramInclude.getParameter(name);
}
- public boolean equals(Object obj) {
- return paramInclude.equals(obj);
- }
-
- /**
- * @param param
- */
public void addParameter(Parameter param) {
paramInclude.addParameter(param);
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java?view=diff&rev=111489&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java&r1=111488&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java&r2=111489
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java Fri Dec 10 02:00:14 2004
@@ -69,7 +69,7 @@
}
}
} catch (Exception e) {
- while (executionStack.isEmpty()) {
+ while (!executionStack.isEmpty()) {
Handler handler = (Handler) executionStack.pop();
handler.revoke(msgctx);
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Phase.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Phase.java?view=diff&rev=111489&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Phase.java&r1=111488&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Phase.java&r2=111489
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Phase.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Phase.java Fri Dec 10 02:00:14 2004
@@ -68,7 +68,7 @@
}
}
} catch (Exception e) {
- while (executionStack.isEmpty()) {
+ while (!executionStack.isEmpty()) {
Handler handler = (Handler) executionStack.pop();
handler.revoke(msgctx);
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/AbstractProvider.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/AbstractProvider.java?view=diff&rev=111489&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/AbstractProvider.java&r1=111488&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/AbstractProvider.java&r2=111489
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/AbstractProvider.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/AbstractProvider.java Fri Dec 10 02:00:14 2004
@@ -25,7 +25,7 @@
* @author Srinath Perera(hemapani@opensource.lk)
*/
public abstract class AbstractProvider implements Provider{
- private QName name;
+ protected QName name;
public QName getName() {
return name;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/RawXMLProvider.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/RawXMLProvider.java?view=diff&rev=111489&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/RawXMLProvider.java&r1=111488&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/RawXMLProvider.java&r2=111489
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/RawXMLProvider.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/RawXMLProvider.java Fri Dec 10 02:00:14 2004
@@ -44,7 +44,6 @@
protected Log log = LogFactory.getLog(getClass());
private String message;
- private QName name;
private String scope;
private Method method;
private ClassLoader classLoader;
@@ -102,9 +101,6 @@
}
- public QName getName() {
- return name;
- }
public MessageContext invoke(MessageContext msgContext) throws AxisFault {
try {
@@ -155,9 +151,6 @@
log.info("I am Speaking Provider revoking :)");
}
- public void setName(QName name) {
- this.name = name;
- }
/**
* @return
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java?view=diff&rev=111489&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java&r1=111488&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java&r2=111489
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java Fri Dec 10 02:00:14 2004
@@ -50,7 +50,9 @@
assertSame(modlue,reg.getModule(moduleName));
assertSame(service,reg.getService(serviceName));
+ reg.removeService(serviceName);
assertSame(ag,reg.getGlobal());
+ assertNull(reg.getService(serviceName));
}
public void testHandlerMedatata(){
@@ -62,6 +64,8 @@
AxisService service = new SimpleAxisServiceImpl(new QName("Service1"));
testParameteInClude(service);
testFlowIncludeTest(service);
+
+
}
public void testModule(){