[jboss-cvs] JBossAS SVN: r74721 - projects/aop/trunk/aop/src/main/org/jboss/aop/hook.

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

Author: flavia.rainone at jboss.com
Date: 2008-06-17 15:45:01 -0400 (Tue, 17 Jun 2008)
New Revision: 74721

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitPluggableClassPreProcessor.java
Log:
[JBAOP-600] The patch has been incorporated to trunk.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.java	2008-06-17 19:44:38 UTC (rev 74720)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.java	2008-06-17 19:45:01 UTC (rev 74721)
@@ -1,24 +1,24 @@
 /*
-  * 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.
-  */
+ * 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.aop.hook;
 
 import org.jboss.aop.AspectManager;
@@ -27,7 +27,8 @@
 import com.bea.jvm.ClassPreProcessor;
 import com.bea.jvm.JVMFactory;
 
-public class JRockitClassPreProcessor implements ClassPreProcessor{
+public class JRockitClassPreProcessor implements ClassPreProcessor
+{
 
    static
    {
@@ -52,7 +53,8 @@
 
       try
       {
-         return AspectManager.instance().translate(classname, loader, bytes);
+         byte[] result = AspectManager.instance().translate(classname, loader, bytes);
+         return result == null? bytes: result;
       }
       catch (Exception e)
       {

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitPluggableClassPreProcessor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitPluggableClassPreProcessor.java	2008-06-17 19:44:38 UTC (rev 74720)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitPluggableClassPreProcessor.java	2008-06-17 19:45:01 UTC (rev 74721)
@@ -1,31 +1,32 @@
 /*
-  * 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.
-  */
+ * 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.aop.hook;
 
 import com.bea.jvm.ClassLibrary;
 import com.bea.jvm.ClassPreProcessor;
 import com.bea.jvm.JVMFactory;
 
-public class JRockitPluggableClassPreProcessor implements ClassPreProcessor{
+public class JRockitPluggableClassPreProcessor implements ClassPreProcessor
+{
 
    static
    {
@@ -43,7 +44,7 @@
    public byte[] preProcess(ClassLoader loader, String classname, byte[] bytes) 
    {
       classname = classname.replace('/', '.');
-      return JDK14TransformerManager.transform(loader, classname, bytes);
+      byte[] result = JDK14TransformerManager.transform(loader, classname, bytes);
+      return result == null? bytes: result;
    }
-
-}
+}
\ No newline at end of file