perfsonar development work

Author: yi
Date: 2006-11-22 12:10:22 -0500 (Wed, 22 Nov 2006)
New Revision: 1772

Modified:
   
branches/yi-udel/perfsonar/src/org/perfsonar/commons/auxiliary/components/simplescheduler/SchedulerAction.java
   
branches/yi-udel/perfsonar/src/org/perfsonar/commons/auxiliary/components/simplescheduler/SchedulerTask.java
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/commons/storage/xmldb/bdbxml/BerkeleyDbXmlStorageManager.java
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSSummary.java
Log:
fix the problem of BDB memory out of boundary

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/commons/auxiliary/components/simplescheduler/SchedulerAction.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/commons/auxiliary/components/simplescheduler/SchedulerAction.java
      2006-11-22 09:55:48 UTC (rev 1771)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/commons/auxiliary/components/simplescheduler/SchedulerAction.java
      2006-11-22 17:10:22 UTC (rev 1772)
@@ -6,8 +6,7 @@
  * @author Maciej Glowiak
  *
  */
-public interface SchedulerAction {
+public interface SchedulerAction{
     
     public void runAction();
-
 }

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/commons/auxiliary/components/simplescheduler/SchedulerTask.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/commons/auxiliary/components/simplescheduler/SchedulerTask.java
        2006-11-22 09:55:48 UTC (rev 1771)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/commons/auxiliary/components/simplescheduler/SchedulerTask.java
        2006-11-22 17:10:22 UTC (rev 1772)
@@ -47,7 +47,7 @@
                 @Override
                 public void run() {
                     super.run();
-                    action.runAction();                    
+                    action.runAction();
                 }
             }.start();
             

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/commons/storage/xmldb/bdbxml/BerkeleyDbXmlStorageManager.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/commons/storage/xmldb/bdbxml/BerkeleyDbXmlStorageManager.java
  2006-11-22 09:55:48 UTC (rev 1771)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/commons/storage/xmldb/bdbxml/BerkeleyDbXmlStorageManager.java
  2006-11-22 17:10:22 UTC (rev 1772)
@@ -68,9 +68,9 @@
     //final static String XML_DB_HOME = "/home/jason/xmldb";
     
//------------------------------------------------------------------------
     
-    private Environment myEnv;
-    private XmlManager myManager;
-    private XmlContainer myContainer;
+    private static Environment myEnv = null;
+    private XmlManager myManager = null;
+    private XmlContainer myContainer = null;
     
     public BerkeleyDbXmlStorageManager ()
     {
@@ -82,23 +82,22 @@
     private void openManager () throws DatabaseException, 
FileNotFoundException
     {
        // Environment
-       File envHome = new File (XML_DB_HOME);
-               EnvironmentConfig envConf = new EnvironmentConfig();
-                       
-               envConf.setCacheSize(50 * 1024 * 1024);
-               envConf.setAllowCreate(true);
-               envConf.setInitializeCache(true);
-               envConf.setTransactional(true);
-               envConf.setInitializeLocking(true);
-               envConf.setInitializeLogging(true);
-               
-               if (DEBUG)
-               {
-                       envConf.setErrorStream (System.err);
-               }
-               
-               myEnv = new Environment(envHome, envConf);
-               
+       if (myEnv == null)
+       {
+               File envHome = new File (XML_DB_HOME);
+                       EnvironmentConfig envConf = new EnvironmentConfig();
+                               
+                       envConf.setCacheSize(50 * 1024 * 1024);
+                       envConf.setAllowCreate(true);
+                       envConf.setInitializeCache(true);
+                       envConf.setTransactional(true);
+                       envConf.setInitializeLocking(true);
+                       envConf.setInitializeLogging(true);
+                       if (DEBUG) { envConf.setErrorStream (System.err); }
+                       
+                       myEnv = new Environment(envHome, envConf);
+       }
+       
                // XmlManager
                XmlManagerConfig managerConf = new XmlManagerConfig ();
                //avoid using setAdoptEnvironment when you set 
setAllowAutoOpen to be true
@@ -167,7 +166,7 @@
         catch (XmlException e)
         {            
                throw new SystemException("error.common.storage.xmldb.query",
-                                       "Can't disconnection Berkeley DB: 
"+e.getMessage());
+                                       "Can't disconnect Berkeley DB: 
"+e.getMessage());
         }
     }
     

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSSummary.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSSummary.java
   2006-11-22 09:55:48 UTC (rev 1771)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSSummary.java
   2006-11-22 17:10:22 UTC (rev 1772)
@@ -332,7 +332,7 @@
             catch (PerfSONARException e) {
                 //Catch nothing for now?
             }  
-        }    
+        }
     }