activemq git commit: https://issues.apache.org/jira/browse/AMQ-5896

[cs...@apache.org]

Repository: activemq
Updated Branches:
  refs/heads/master 310c2bb05 -> b64b8ba27


https://issues.apache.org/jira/browse/AMQ-5896

Removing the dependency on the ExceptionUtils class in Apache Commons
as that dependency is only available at test time


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

Branch: refs/heads/master
Commit: b64b8ba27e876a011f62f70ffdfc6e7cde1fff24
Parents: 310c2bb
Author: Christopher L. Shannon <ch...@gmail.com>
Authored: Fri Jul 31 20:16:01 2015 -0400
Committer: Christopher L. Shannon <ch...@gmail.com>
Committed: Fri Jul 31 20:16:01 2015 -0400

----------------------------------------------------------------------
 .../activemq/web/BrokerFacadeSupport.java       |  5 +-
 .../activemq/web/util/ExceptionUtils.java       | 54 ++++++++++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/b64b8ba2/activemq-web/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java
----------------------------------------------------------------------
diff --git a/activemq-web/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java b/activemq-web/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java
index fedc6f2..07ef9ab 100644
--- a/activemq-web/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java
+++ b/activemq-web/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java
@@ -42,7 +42,7 @@ import org.apache.activemq.broker.jmx.ProducerViewMBean;
 import org.apache.activemq.broker.jmx.QueueViewMBean;
 import org.apache.activemq.broker.jmx.SubscriptionViewMBean;
 import org.apache.activemq.broker.jmx.TopicViewMBean;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.activemq.web.util.ExceptionUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -135,8 +135,7 @@ public abstract class BrokerFacadeSupport implements BrokerFacade {
                     return destinationViewMBean;
                 }
             } catch (Exception ex) {
-                Class<InstanceNotFoundException> infe = InstanceNotFoundException.class;
-                if (!infe.isInstance(ex) && !infe.isInstance(ExceptionUtils.getRootCause(ex))) {
+                if (!ExceptionUtils.isRootCause(ex, InstanceNotFoundException.class)) {
                     // Only throw if not an expected InstanceNotFoundException exception
                     throw ex;
                 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/b64b8ba2/activemq-web/src/main/java/org/apache/activemq/web/util/ExceptionUtils.java
----------------------------------------------------------------------
diff --git a/activemq-web/src/main/java/org/apache/activemq/web/util/ExceptionUtils.java b/activemq-web/src/main/java/org/apache/activemq/web/util/ExceptionUtils.java
new file mode 100644
index 0000000..cd9b6bb
--- /dev/null
+++ b/activemq-web/src/main/java/org/apache/activemq/web/util/ExceptionUtils.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.web.util;
+
+public class ExceptionUtils {
+
+    /**
+     * Finds the root cause of an exception.  Will return the original
+     * exception if the first getCause returns null.
+     *
+     * @param e
+     * @return
+     */
+    public static Throwable getRootCause(final Throwable e) {
+        Throwable result = e;
+
+        //loop over to find the root cause while guarding against cycles
+        while(result != null && result.getCause() != null
+                && e != result.getCause() && result != result.getCause() ) {
+            result = result.getCause();
+        }
+
+        return result;
+    }
+
+    /**
+     * Returns true if the passed in class is the root cause of the exception
+     *
+     * @param e
+     * @param clazz
+     * @return
+     */
+    public static boolean isRootCause(final Throwable e, final Class<?> clazz) {
+        if (clazz == null || e == null) {
+            return false;
+        }
+        return clazz.isInstance(getRootCause(e));
+    }
+
+}