You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/08/12 17:12:50 UTC

svn commit: r1695549 - /qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java

Author: kwall
Date: Wed Aug 12 15:12:50 2015
New Revision: 1695549

URL: http://svn.apache.org/r1695549
Log:
QPID-6690: [Java Broker] Unify approach to exception handling in org.AbstractConfiguredObject#doOnConfigThread

Modified:
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1695549&r1=1695548&r2=1695549&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java Wed Aug 12 15:12:50 2015
@@ -51,7 +51,6 @@ import java.util.concurrent.ExecutionExc
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
 import javax.security.auth.Subject;
@@ -518,14 +517,9 @@ public abstract class AbstractConfigured
                         }
                     });
                 }
-                catch (Exception e)
-                {
-                    returnVal.setException(e);
-                }
                 catch(Throwable t)
                 {
                     returnVal.setException(t);
-                    throw t;
                 }
                 return null;
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org