[jboss-cvs] JBossAS SVN: r59458 - branches/Branch_4_2/aspects/src/main/org/jboss/aspects/remoting.

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

Author: bdecoste
Date: 2007-01-09 15:23:15 -0500 (Tue, 09 Jan 2007)
New Revision: 59458

Modified:
   branches/Branch_4_2/aspects/src/main/org/jboss/aspects/remoting/InvokeRemoteInterceptor.java
Log:
support for new remoting package - no mbean-dd, client.connect()

Modified: branches/Branch_4_2/aspects/src/main/org/jboss/aspects/remoting/InvokeRemoteInterceptor.java
===================================================================
--- branches/Branch_4_2/aspects/src/main/org/jboss/aspects/remoting/InvokeRemoteInterceptor.java	2007-01-09 20:23:11 UTC (rev 59457)
+++ branches/Branch_4_2/aspects/src/main/org/jboss/aspects/remoting/InvokeRemoteInterceptor.java	2007-01-09 20:23:15 UTC (rev 59458)
@@ -1,28 +1,29 @@
 /*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
 package org.jboss.aspects.remoting;
 
 import java.io.ObjectStreamException;
 
+import org.jboss.logging.Logger;
 import org.jboss.remoting.Client;
 import org.jboss.remoting.InvokerLocator;
 /**
@@ -33,6 +34,8 @@
  */
 public class InvokeRemoteInterceptor implements org.jboss.aop.advice.Interceptor, java.io.Serializable
 {
+   private static final Logger log = Logger.getLogger(InvokeRemoteInterceptor.class);
+   
    private static final long serialVersionUID = -145166951731929406L;
    
    public static final InvokeRemoteInterceptor singleton = new InvokeRemoteInterceptor();
@@ -52,9 +55,39 @@
       String subsystem = (String)invocation.getMetaData(REMOTING, SUBSYSTEM);
       if (subsystem == null) subsystem = "AOP";
       Client client = new Client(locator, subsystem);
-      org.jboss.aop.joinpoint.InvocationResponse response = (org.jboss.aop.joinpoint.InvocationResponse)client.invoke(invocation, null);
-      invocation.setResponseContextInfo(response.getContextInfo());
-      return response.getResponse();
+      
+      try 
+      {
+         client.connect();
+         org.jboss.aop.joinpoint.InvocationResponse response = (org.jboss.aop.joinpoint.InvocationResponse)client.invoke(invocation, null);
+         invocation.setResponseContextInfo(response.getContextInfo());
+         return response.getResponse();
+      }
+      catch (Exception e)
+      {
+         StackTraceElement[] serverStackTrace;
+         if (e.getCause() != null)
+            serverStackTrace = e.getCause().getStackTrace();
+         else
+            serverStackTrace = e.getStackTrace();
+         
+         Exception clientException = new Exception();
+         StackTraceElement[] clientStackTrace = clientException.getStackTrace();
+         StackTraceElement[] completeStackTrace = new StackTraceElement[serverStackTrace.length + clientStackTrace.length];
+         System.arraycopy(serverStackTrace, 0, completeStackTrace, 0, serverStackTrace.length);
+         System.arraycopy(clientStackTrace, 0, completeStackTrace, serverStackTrace.length, clientStackTrace.length);
+         
+         if (e.getCause() != null)
+            e.getCause().setStackTrace(completeStackTrace);
+         else
+            e.setStackTrace(completeStackTrace);
+         
+         throw e;
+      }
+      finally
+      {
+         client.disconnect();
+      }
    }
 
    Object readResolve() throws ObjectStreamException {