You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2009/02/11 23:54:57 UTC
svn commit: r743550 - in /ode/sandbox/simpel/lang/src/main/java/org/apache/ode: embed/ServerLifecycle.java simpel/SimPELCompiler.java

Author: mriou
Date: Wed Feb 11 22:54:57 2009
New Revision: 743550

URL: http://svn.apache.org/viewvc?rev=743550&view=rev
Log:
Fixing a couple of small bugs.

Modified:
    ode/sandbox/simpel/lang/src/main/java/org/apache/ode/embed/ServerLifecycle.java
    ode/sandbox/simpel/lang/src/main/java/org/apache/ode/simpel/SimPELCompiler.java

Modified: ode/sandbox/simpel/lang/src/main/java/org/apache/ode/embed/ServerLifecycle.java
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/lang/src/main/java/org/apache/ode/embed/ServerLifecycle.java?rev=743550&r1=743549&r2=743550&view=diff
==============================================================================
--- ode/sandbox/simpel/lang/src/main/java/org/apache/ode/embed/ServerLifecycle.java (original)
+++ ode/sandbox/simpel/lang/src/main/java/org/apache/ode/embed/ServerLifecycle.java Wed Feb 11 22:54:57 2009
@@ -74,7 +74,7 @@
 
     public void clean() {
         EngineWebResource.stopRestfulServer();
-        _db.shutdown();
+        if (_db != null) _db.shutdown();
         _server = null;
         _txMgr = null;
         _executorService = null;

Modified: ode/sandbox/simpel/lang/src/main/java/org/apache/ode/simpel/SimPELCompiler.java
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/lang/src/main/java/org/apache/ode/simpel/SimPELCompiler.java?rev=743550&r1=743549&r2=743550&view=diff
==============================================================================
--- ode/sandbox/simpel/lang/src/main/java/org/apache/ode/simpel/SimPELCompiler.java (original)
+++ ode/sandbox/simpel/lang/src/main/java/org/apache/ode/simpel/SimPELCompiler.java Wed Feb 11 22:54:57 2009
@@ -57,7 +57,7 @@
     }
 
     public OProcess compileProcess(String processDoc, Descriptor desc) {
-        return compileProcess(new File("."), processDoc, desc);
+        return compileProcess(new File(".").getAbsoluteFile(), processDoc, desc);
     }
 
     public OProcess compileProcess(File f, String processDoc, Descriptor desc) {
@@ -90,9 +90,9 @@
         newScope.setParentScope(null);
 
         // Setting some globals part of the environment in which processes execute
-        cx.evaluateString(newScope, MessageFormat.format(GLOBALS, f.getParentFile().getAbsolutePath()), "<cmd>", 1, null);
+        cx.evaluateString(newScope, MessageFormat.format(GLOBALS, f == null ? "." : f.getParentFile().getAbsolutePath()), "<cmd>", 1, null);
         try {
-            cx.evaluateString(newScope, header, f.getAbsolutePath(), 1, null);
+            cx.evaluateString(newScope, header, f == null ? "." : f.getAbsolutePath(), 1, null);
         } catch (Exception e) {
             fatalCompilationError("Error when interpreting definitions in the process header: " + e.toString());
         }