You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2015/06/09 11:18:21 UTC

ode git commit: ODE-928: e.printStackTrace()s removed, backport from 1.3.x

Repository: ode
Updated Branches:
  refs/heads/master 8e25a0614 -> 8538f0035


ODE-928: e.printStackTrace()s removed, backport from 1.3.x


Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/8538f003
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/8538f003
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/8538f003

Branch: refs/heads/master
Commit: 8538f00353b6f41c0fb84c59947d0f7385193178
Parents: 8e25a06
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Tue Jun 9 11:18:11 2015 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue Jun 9 11:18:11 2015 +0200

----------------------------------------------------------------------
 axis2/src/main/java/org/apache/ode/axis2/ODEAxis2Server.java     | 2 +-
 .../java/org/apache/ode/axis2/service/ManagementService.java     | 4 ++--
 axis2/src/main/java/org/apache/ode/axis2/util/WLSFactory.java    | 2 +-
 bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java  | 2 +-
 .../main/java/org/apache/ode/il/config/OdeConfigProperties.java  | 2 +-
 .../main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java    | 2 +-
 .../main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java  | 2 +-
 .../main/java/org/apache/ode/karaf/commands/OdeListCommand.java  | 4 ++--
 jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java    | 2 --
 tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java  | 2 +-
 10 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/8538f003/axis2/src/main/java/org/apache/ode/axis2/ODEAxis2Server.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/ODEAxis2Server.java b/axis2/src/main/java/org/apache/ode/axis2/ODEAxis2Server.java
index 4287eb2..ebc86f3 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/ODEAxis2Server.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/ODEAxis2Server.java
@@ -170,7 +170,7 @@ public class ODEAxis2Server extends AxisServer {
             try {
                 fos = new FileOutputStream(fileName);
             } catch (FileNotFoundException e) {
-                e.printStackTrace();
+                log.error(e.getMessage(), e);
             }
             configContext.getAxisConfiguration().getService(serviceName).printWSDL(fos);
         }

http://git-wip-us.apache.org/repos/asf/ode/blob/8538f003/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java b/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java
index 66113ee..3b4833f 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java
@@ -43,7 +43,7 @@ import org.apache.axis2.description.AxisService;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.receivers.AbstractMessageReceiver;
-import org.apache.axis2.util.Utils;
+import org.apache.axis2.util.MessageContextBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ode.axis2.hooks.ODEAxisService;
@@ -123,7 +123,7 @@ public class ManagementService {
 
         public void invokeBusinessLogic(MessageContext messageContext) throws AxisFault {
             DynamicService<T> service = new DynamicService<T>(_service);
-            MessageContext outMsgContext = Utils.createOutMessageContext(messageContext);
+            MessageContext outMsgContext = MessageContextBuilder.createOutMessageContext(messageContext);
             outMsgContext.getOperationContext().addMessageContext(outMsgContext);
             SOAPFactory soapFactory = getSOAPFactory(messageContext);
             SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();

http://git-wip-us.apache.org/repos/asf/ode/blob/8538f003/axis2/src/main/java/org/apache/ode/axis2/util/WLSFactory.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/util/WLSFactory.java b/axis2/src/main/java/org/apache/ode/axis2/util/WLSFactory.java
index 506766f..6a4643c 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/util/WLSFactory.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/util/WLSFactory.java
@@ -54,7 +54,7 @@ public class WLSFactory {
             Context ctx = new InitialContext(env);
             tm = (TransactionManager) ctx.lookup("javax.transaction.TransactionManager");
         } catch (NamingException e) {
-            e.printStackTrace();
+            throw new RuntimeException( "Error while looking up TransactionManager", e);
         }
 
         return tm;

http://git-wip-us.apache.org/repos/asf/ode/blob/8538f003/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java b/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
index 7d8d6da..9a50bdf 100644
--- a/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
+++ b/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java
@@ -185,7 +185,7 @@ public class WSAEndpoint implements MutableEndpoint {
             try {
                 serviceNS = _eprElmt.getOwnerDocument().lookupNamespaceURI(prefix);
             } catch (Exception e) {
-                e.printStackTrace();
+                __log.error(e.getMessage(), e);
             }
             // Lookup failed, checking directly on our element
             if (serviceNS == null) {

http://git-wip-us.apache.org/repos/asf/ode/blob/8538f003/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java b/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
index 39ca2b0..16f1e62 100644
--- a/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
+++ b/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
@@ -183,7 +183,7 @@ public class OdeConfigProperties {
                     try {
                         fis.close();
                     } catch (Exception ex) {
-                        ex.printStackTrace();
+                        __log.error(ex.getMessage(), ex);
                     }
             }
         } else {

http://git-wip-us.apache.org/repos/asf/ode/blob/8538f003/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java
----------------------------------------------------------------------
diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java
index 1661bd0..c3c3d63 100644
--- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java
+++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java
@@ -240,7 +240,7 @@ class CriteriaBuilder {
         try {
             dt = ISO8601DateParser.parse(date);
         } catch (ParseException e) {
-            e.printStackTrace();
+            __log.error(e.getMessage(), e);
         }
         Timestamp ts = new Timestamp(dt.getTime());
         return op + " '" + ts.toString() + "'";

http://git-wip-us.apache.org/repos/asf/ode/blob/8538f003/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
----------------------------------------------------------------------
diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
index 37338ac..17e7903 100644
--- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
+++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
@@ -148,7 +148,7 @@ public class BPELDAOConnectionImpl implements BpelDAOConnection {
         try {
             dt = ISO8601DateParser.parse(date);
         } catch (ParseException e) {
-            e.printStackTrace();
+            __log.error(e.getMessage(), e);
         }
         Timestamp ts = new Timestamp(dt.getTime());
         return op + " '" + ts.toString() + "'";

http://git-wip-us.apache.org/repos/asf/ode/blob/8538f003/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java
----------------------------------------------------------------------
diff --git a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java
index e091926..6fcd7cf 100644
--- a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java
+++ b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java
@@ -117,7 +117,7 @@ public class OdeListCommand extends OdeCommandsBase {
                 collectFailedActivities(scopeInfo, failedActivites);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            __log.error(e.getMessage(), e);
         }
         return failedActivites;
     }
@@ -131,7 +131,7 @@ public class OdeListCommand extends OdeCommandsBase {
                     return scopeInfoDoc.getScopeInfo();
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                __log.error(e.getMessage(), e);
             }
         }
         return null;

http://git-wip-us.apache.org/repos/asf/ode/blob/8538f003/jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java
----------------------------------------------------------------------
diff --git a/jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java b/jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java
index 6c07b9c..d3b800f 100644
--- a/jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java
+++ b/jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java
@@ -100,10 +100,8 @@ class OdeConnectionImpl implements InvocationHandler, Connection {
       String methodSig = Reflect.generateMethodSignature(method);
       return mc().getTransport().invokeConnectionMethod(methodSig, args);
     } catch (RuntimeException pe) {
-      pe.printStackTrace();
       throw new OdeConnectionException("Unexpected RuntimeException", pe);
     } catch (RemoteException re) {
-      re.printStackTrace();
       throw new OdeConnectionException("Unexpected RemoteException.", re);
     } catch (InvocationTargetException ite) {
       throw ite.getTargetException();

http://git-wip-us.apache.org/repos/asf/ode/blob/8538f003/tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java
----------------------------------------------------------------------
diff --git a/tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java b/tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java
index f351578..4d4831c 100644
--- a/tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java
+++ b/tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java
@@ -104,7 +104,7 @@ public class BpelC extends BaseCommandlineTool {
             // This is really quite unexpected, so we should
             // print the stack trace to stderr.
             consoleErr(t.getMessage());
-            t.printStackTrace();
+            __log.error(t.getMessage(), t);
             System.exit(-2);
         }
         System.exit(0);