[Jpox-commits] SF.net SVN: jpox: [2425] platform/core/trunk/src/java/org/jpox

[<and...@us...>]

Revision: 2425
          http://jpox.svn.sourceforge.net/jpox/?rev=2425&view=rev
Author:   andy_jefferson
Date:     2008-04-29 10:50:18 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
[JCA-8] Changes from DataNucleus for JCA usage of persistence-unit

Modified Paths:
--------------
    platform/core/trunk/src/java/org/jpox/jdo/AbstractPersistenceManagerFactory.java
    platform/core/trunk/src/java/org/jpox/metadata/MetaDataManager.java
    platform/core/trunk/src/java/org/jpox/metadata/xml/MetaDataParser.java

Modified: platform/core/trunk/src/java/org/jpox/jdo/AbstractPersistenceManagerFactory.java
===================================================================
--- platform/core/trunk/src/java/org/jpox/jdo/AbstractPersistenceManagerFactory.java	2008-04-26 20:14:58 UTC (rev 2424)
+++ platform/core/trunk/src/java/org/jpox/jdo/AbstractPersistenceManagerFactory.java	2008-04-29 17:50:18 UTC (rev 2425)
@@ -560,7 +560,7 @@
     public synchronized void setPersistenceXmlFilename(String name)
     {
         assertConfigurable();
-        setProperty("org.jpox.PersistenceXmlFilename", name);
+        setProperty("org.jpox.persistenceXmlFilename", name);
     }
 
     /**
@@ -806,7 +806,7 @@
      */
     public String getPersistenceXmlFilename()
     {
-        return getStringProperty("org.jpox.PersistenceXmlFilename");
+        return getStringProperty("org.jpox.persistenceXmlFilename");
     }
 
     /**

Modified: platform/core/trunk/src/java/org/jpox/metadata/MetaDataManager.java
===================================================================
--- platform/core/trunk/src/java/org/jpox/metadata/MetaDataManager.java	2008-04-26 20:14:58 UTC (rev 2424)
+++ platform/core/trunk/src/java/org/jpox/metadata/MetaDataManager.java	2008-04-29 17:50:18 UTC (rev 2425)
@@ -1516,12 +1516,15 @@
             for (int i=0;i<files.length;i++)
             {
                 PersistenceUnitMetaData[] unitmds = files[i].getPersistenceUnits();
-                for (int j=0;j<unitmds.length;j++)
+                if (unitmds != null)
                 {
-                    if (unitmds[j].getName().equals(unitName))
+                    for (int j=0;j<unitmds.length;j++)
                     {
-                        // Found the required unit
-                        return unitmds[j];
+                        if (unitmds[j].getName().equals(unitName))
+                        {
+                            // Found the required unit
+                            return unitmds[j];
+                        }
                     }
                 }
             }
@@ -1543,6 +1546,10 @@
             try
             {
                 URL fileURL = new URL(filename);
+                if (metaDataParser == null)
+                {
+                    new MetaDataParser(this, validateMetaData);
+                }
                 MetaData permd = metaDataParser.parseMetaDataURL(fileURL, "persistence");
                 return new PersistenceFileMetaData[] {(PersistenceFileMetaData)permd};
             }
@@ -1565,7 +1572,10 @@
                 return null;
             }
 
-            metaDataParser = new MetaDataParser(this, validateMetaData);
+            if (metaDataParser == null)
+            {
+                metaDataParser = new MetaDataParser(this, validateMetaData);
+            }
             for ( ; files.hasMoreElements() ;)
             {
                 // Parse the "persistence.xml"

Modified: platform/core/trunk/src/java/org/jpox/metadata/xml/MetaDataParser.java
===================================================================
--- platform/core/trunk/src/java/org/jpox/metadata/xml/MetaDataParser.java	2008-04-26 20:14:58 UTC (rev 2424)
+++ platform/core/trunk/src/java/org/jpox/metadata/xml/MetaDataParser.java	2008-04-29 17:50:18 UTC (rev 2425)
@@ -175,7 +175,7 @@
      * @return The MetaData for this file
      * @throws JPOXException thrown if error occurred
      */
-    public MetaData parseMetaDataStream(InputStream in, String filename, String handlerName)
+    public synchronized MetaData parseMetaDataStream(InputStream in, String filename, String handlerName)
     {
         if (in == null)
         {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.