[jboss-svn-commits] JBoss Common SVN: r2416 - in common-core/branches/2_0: src/main/java/org/jboss/util/stream and 2 other directories.

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

Author: jason.greene at jboss.com
Date: 2007-06-13 20:27:11 -0400 (Wed, 13 Jun 2007)
New Revision: 2416

Added:
   common-core/branches/2_0/src/test/java/org/jboss/test/util/test/stream/
   common-core/branches/2_0/src/test/java/org/jboss/test/util/test/stream/MarshallValueStreamTestCase.java
Removed:
   common-core/branches/2_0/src/test/java/org/jboss/test/util/test/stream/MarshallValueStreamTestCase.java
Modified:
   common-core/branches/2_0/pom.xml
   common-core/branches/2_0/src/main/java/org/jboss/util/stream/MarshalledValueInputStream.java
Log:
Merge 2414 & 2415


Modified: common-core/branches/2_0/pom.xml
===================================================================
--- common-core/branches/2_0/pom.xml	2007-06-13 21:48:09 UTC (rev 2415)
+++ common-core/branches/2_0/pom.xml	2007-06-14 00:27:11 UTC (rev 2416)
@@ -58,6 +58,12 @@
       <artifactId>jboss-test</artifactId>
       <version>1.0.3.GA</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: common-core/branches/2_0/src/main/java/org/jboss/util/stream/MarshalledValueInputStream.java
===================================================================
--- common-core/branches/2_0/src/main/java/org/jboss/util/stream/MarshalledValueInputStream.java	2007-06-13 21:48:09 UTC (rev 2415)
+++ common-core/branches/2_0/src/main/java/org/jboss/util/stream/MarshalledValueInputStream.java	2007-06-14 00:27:11 UTC (rev 2416)
@@ -55,7 +55,9 @@
    {
       ClassLoader loader = Thread.currentThread().getContextClassLoader();
       String className = v.getName();
-      return loader.loadClass(className);
+      
+      // JDK 6, by default, only supports array types (ex. [[B)  using Class.forName() 
+      return Class.forName(className, false, loader);
    }
 
    protected Class resolveProxyClass(String[] interfaces)

Copied: common-core/branches/2_0/src/test/java/org/jboss/test/util/test/stream (from rev 2415, common-core/trunk/src/test/java/org/jboss/test/util/test/stream)

Deleted: common-core/branches/2_0/src/test/java/org/jboss/test/util/test/stream/MarshallValueStreamTestCase.java
===================================================================
--- common-core/trunk/src/test/java/org/jboss/test/util/test/stream/MarshallValueStreamTestCase.java	2007-06-13 21:48:09 UTC (rev 2415)
+++ common-core/branches/2_0/src/test/java/org/jboss/test/util/test/stream/MarshallValueStreamTestCase.java	2007-06-14 00:27:11 UTC (rev 2416)
@@ -1,35 +0,0 @@
-package org.jboss.test.util.test.stream;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectStreamClass;
-
-import java.util.Arrays;
-
-import junit.framework.TestCase;
-
-import org.jboss.util.stream.MarshalledValueInputStream;
-import org.jboss.util.stream.MarshalledValueOutputStream;
-
-/**
- * Test MarshalledValueInput/OutputStream 
- *
- * @see org.jboss.util.propertyeditor.PropertyEditors
- * 
- * @author Jason.Greene at jboss.org 
- * @version $Revision:$
- */
-public class MarshallValueStreamTestCase extends TestCase
-{
-   public void testArrayMarshall() throws Exception
-   {
-      Byte[] bytes = new Byte[] {1, 2, 3};
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      MarshalledValueOutputStream os = new MarshalledValueOutputStream(baos);
-      os.writeObject(bytes);
-      os.flush();
-      MarshalledValueInputStream is = new MarshalledValueInputStream(new ByteArrayInputStream(baos.toByteArray())); 
-      assertTrue(Arrays.equals(bytes, (Byte[]) is.readObject()));
-   }
-}

Copied: common-core/branches/2_0/src/test/java/org/jboss/test/util/test/stream/MarshallValueStreamTestCase.java (from rev 2415, common-core/trunk/src/test/java/org/jboss/test/util/test/stream/MarshallValueStreamTestCase.java)
===================================================================
--- common-core/branches/2_0/src/test/java/org/jboss/test/util/test/stream/MarshallValueStreamTestCase.java	                        (rev 0)
+++ common-core/branches/2_0/src/test/java/org/jboss/test/util/test/stream/MarshallValueStreamTestCase.java	2007-06-14 00:27:11 UTC (rev 2416)
@@ -0,0 +1,35 @@
+package org.jboss.test.util.test.stream;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectStreamClass;
+
+import java.util.Arrays;
+
+import junit.framework.TestCase;
+
+import org.jboss.util.stream.MarshalledValueInputStream;
+import org.jboss.util.stream.MarshalledValueOutputStream;
+
+/**
+ * Test MarshalledValueInput/OutputStream 
+ *
+ * @see org.jboss.util.propertyeditor.PropertyEditors
+ * 
+ * @author Jason.Greene at jboss.org 
+ * @version $Revision:$
+ */
+public class MarshallValueStreamTestCase extends TestCase
+{
+   public void testArrayMarshall() throws Exception
+   {
+      Byte[] bytes = new Byte[] {1, 2, 3};
+      ByteArrayOutputStream baos = new ByteArrayOutputStream();
+      MarshalledValueOutputStream os = new MarshalledValueOutputStream(baos);
+      os.writeObject(bytes);
+      os.flush();
+      MarshalledValueInputStream is = new MarshalledValueInputStream(new ByteArrayInputStream(baos.toByteArray())); 
+      assertTrue(Arrays.equals(bytes, (Byte[]) is.readObject()));
+   }
+}