svn commit: r722486 - in /ode/trunk: axis2/src/main/java/org/apache/ode/axis2/ODEService.java bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java

[boisvert]

Author: boisvert
Date: Tue Dec  2 07:02:36 2008
New Revision: 722486

URL: http://svn.apache.org/viewvc?rev=722486&view=rev
Log:
ODE-445: No endpoint config files results in a null pointer exception

Modified:
    ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
    ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java

Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java?rev=722486&r1=722485&r2=722486&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java 
(original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java Tue Dec  
2 07:02:36 2008
@@ -114,7 +114,7 @@
                 odeMex.invokeBlocking();
             } catch (java.util.concurrent.TimeoutException te) {
                 String errmsg = "Call to " + _serviceName + "." + 
odeMex.getOperationName() + " timed out.";
-                __log.error(errmsg);
+                __log.error(errmsg, te);
                 throw new OdeFault(errmsg);         
             }
             

Modified: 
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java?rev=722486&r1=722485&r2=722486&view=diff
==============================================================================
--- 
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java 
(original)
+++ 
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java 
Tue Dec  2 07:02:36 2008
@@ -133,8 +133,10 @@
                     return path.getName().endsWith(".endpoint") && 
path.isFile();
                 }
             });
-            Arrays.sort(files);
-            propFiles.addAll(Arrays.asList(files));
+            if( files != null ) {
+                   Arrays.sort(files);
+                   propFiles.addAll(Arrays.asList(files));
+            }
         }
         return propFiles;
     }