You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by rp...@apache.org on 2010/06/15 20:15:59 UTC

svn commit: r954993 - in /openjpa/branches/1.1.x: openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshallerImpl.java openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshaller.java

Author: rpalache
Date: Tue Jun 15 18:15:59 2010
New Revision: 954993

URL: http://svn.apache.org/viewvc?rev=954993&view=rev
Log:
OPENJPA-1695 OutOfMemoryError from CacheMarshallerImpl.setInputUrlFromResourceLocation

Modified:
    openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshallerImpl.java
    openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshaller.java

Modified: openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshallerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshallerImpl.java?rev=954993&r1=954992&r2=954993&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshallerImpl.java (original)
+++ openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshallerImpl.java Tue Jun 15 18:15:59 2010
@@ -223,7 +223,7 @@ public class CacheMarshallerImpl
             List list = new ArrayList();
             for (Enumeration e = cl.getResources(_inputResourceLocation);
                 e.hasMoreElements(); )
-                list.add(e);
+                list.add(e.nextElement());
 
             if (list.size() > 1) {
                 if (_consumeErrors) {

Modified: openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshaller.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshaller.java?rev=954993&r1=954992&r2=954993&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshaller.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshaller.java Tue Jun 15 18:15:59 2010
@@ -31,8 +31,9 @@ public class TestCacheMarshaller
             "default(Id=" + getClass().getName() + ", ValidationPolicy="
                 + OpenJPAVersionAndConfigurationTypeValidationPolicy.class
                     .getName()
-                + ", InputURL=file:target/" + getClass().getName() + ".ser"
-                + ", OutputFile=target/"
+                + ", InputURL=file:target/test-classes/" 
+                + getClass().getName() + ".ser"
+                + ", OutputFile=target/test-classes/"
                 + getClass().getName() + ".ser)"
         });
         emf.createEntityManager().close();
@@ -67,4 +68,11 @@ public class TestCacheMarshaller
         cm.store(o);
         assertEquals(o, cm.load());
     }
+    
+    public void testendConfiguration() {
+    	((CacheMarshallerImpl)cm).setInputURL(null);
+        ((CacheMarshallerImpl)cm)
+            .setInputResource(getClass().getName() + ".ser");
+        ((CacheMarshallerImpl)cm).endConfiguration();
+    }
 }