[jboss-cvs] JBoss Messaging SVN: r2033 - in branches/Branch_1_0/src/main/org/jboss/jms: server/destination and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: juha at jboss.org
Date: 2007-01-24 08:49:49 -0500 (Wed, 24 Jan 2007)
New Revision: 2033

Modified:
   branches/Branch_1_0/src/main/org/jboss/jms/client/container/ConnectionAspect.java
   branches/Branch_1_0/src/main/org/jboss/jms/server/destination/Queue.java
   branches/Branch_1_0/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java
Log:


Modified: branches/Branch_1_0/src/main/org/jboss/jms/client/container/ConnectionAspect.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/client/container/ConnectionAspect.java	2007-01-24 10:15:47 UTC (rev 2032)
+++ branches/Branch_1_0/src/main/org/jboss/jms/client/container/ConnectionAspect.java	2007-01-24 13:49:49 UTC (rev 2033)
@@ -45,6 +45,8 @@
  *
  * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>
+ * 
  * @version <tt>$Revision$</tt>
  *
  * $Id$
@@ -196,12 +198,15 @@
             final String msg = "Caught Error on underlying connection";
             log.error(msg, t);
             j = new JMSException(msg + ": " + t.getMessage());
+            j.setLinkedException(new RuntimeException(t));
+            j.initCause(t);
          }
          else if (t instanceof Exception)
          {
             Exception e =(Exception)t;
             j = new JMSException("Throwable received from underlying connection");
-            j.setLinkedException(e);            
+            j.setLinkedException(e);
+            j.initCause(e);
          }
          else
          {
@@ -209,6 +214,8 @@
             final String msg = "Caught Throwable on underlying connection";
             log.error(msg, t);
             j = new JMSException(msg + ": " + t.getMessage());
+            j.setLinkedException(new RuntimeException(t));
+            j.initCause(t);
          }
          synchronized (exceptionListener)
          {

Modified: branches/Branch_1_0/src/main/org/jboss/jms/server/destination/Queue.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/server/destination/Queue.java	2007-01-24 10:15:47 UTC (rev 2032)
+++ branches/Branch_1_0/src/main/org/jboss/jms/server/destination/Queue.java	2007-01-24 13:49:49 UTC (rev 2033)
@@ -22,6 +22,8 @@
  * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:alex.fu at novell.com">Alex Fu</a>
+ * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>
+ * 
  * @version <tt>$Revision$</tt>
  *
  * $Id$
@@ -127,9 +129,10 @@
          }
          catch (InvalidSelectorException e)
          {
-            Throwable th = new JMSException(e.getMessage());
+            JMSException th = new JMSException(e.getMessage());
             th.initCause(e);
-            throw (JMSException)th;
+            th.setLinkedException(e);
+            throw th;
          }
       }
       catch (Throwable t)

Modified: branches/Branch_1_0/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java	2007-01-24 10:15:47 UTC (rev 2032)
+++ branches/Branch_1_0/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java	2007-01-24 13:49:49 UTC (rev 2033)
@@ -65,6 +65,7 @@
  * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
  * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
  * @author <a href="mailto:ivelin at jboss.org">Ivelin Ivanov</a>
+ * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>
  *
  * JDBCChannelMapper.java,v 1.1 2006/03/01 09:15:09 timfox Exp
  */
@@ -310,6 +311,7 @@
             log.error("Failed to load queue state", e);
             JMSException e2 = new JMSException("Failed to load queue state");
             e2.setLinkedException(e);
+            e2.initCause(e);
             throw e2;
          }
          
@@ -342,6 +344,7 @@
                log.error("Failed to load queue state", e);
                JMSException e2 = new JMSException("Failed to load durable subscription state");
                e2.setLinkedException(e);
+               e2.initCause(e);
                throw e2;
             }
             //and connect it to the Topic
@@ -458,7 +461,7 @@
       }
       
       idMap.put(new Long(id), jbd);
-      
+
       log.debug("core destination " + cd + " (fullSize=" + fullSize + ", pageSize=" +
                pageSize  + ", downCacheSize=" + downCacheSize + ") deployed");
    }
@@ -708,6 +711,7 @@
          log.error(msg, e);
          JMSException e2 = new JMSException(msg);
          e2.setLinkedException(e);
+         e2.initCause(e);
          throw e2;
       }
    }