Author: mriou
Date: Sat Feb 28 01:27:24 2009
New Revision: 748765
URL: http://svn.apache.org/viewvc?rev=748765&view=rev
Log:
No need to have two in-mem DAOs.
Modified:
ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/Contexts.java
ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
Modified:
ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java?rev=748765&r1=748764&r2=748765&view=diff
==============================================================================
---
ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
(original)
+++
ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
Sat Feb 28 01:27:24 2009
@@ -129,7 +129,7 @@
String processMaxAge = System.getProperty("ode.process.maxage");
if (processMaxAge != null && processMaxAge.length() > 0) {
__processMaxAge = Long.valueOf(processMaxAge);
- __log.info("Process definition max age adjusted. Max age = " +
__processMaxAge + "ms.");
+ __log.debug("Process definition max age adjusted. Max age = "
+ __processMaxAge + "ms.");
}
} catch (Throwable t) {
if (__log.isDebugEnabled()) {
@@ -208,7 +208,7 @@
_contexts.scheduler.start();
_state = State.RUNNING;
- __log.info(__msgs.msgServerStarted());
+ __log.debug(__msgs.msgServerStarted());
if (_dehydrationPolicy != null)
new Thread(new ProcessDefReaper()).start();
} finally {
@@ -277,7 +277,7 @@
_contexts.scheduler.stop();
_state = State.INIT;
- __log.info(__msgs.msgServerStopped());
+ __log.debug(__msgs.msgServerStopped());
} finally {
_mngmtLock.writeLock().unlock();
}
@@ -375,7 +375,7 @@
_registeredProcesses.put(process.getPID(), process);
if (_dehydrationPolicy == null) process.hydrate();
- __log.info(__msgs.msgProcessRegistered(conf.getProcessId()));
+ __log.debug(__msgs.msgProcessRegistered(conf.getProcessId()));
} finally {
_mngmtLock.writeLock().unlock();
}
@@ -408,7 +408,7 @@
processes.remove(p);
}
- __log.info(__msgs.msgProcessUnregistered(pid));
+ __log.debug(__msgs.msgProcessUnregistered(pid));
} catch (Exception ex) {
__log.error(__msgs.msgProcessUnregisterFailed(pid), ex);
@@ -503,7 +503,7 @@
public Void call() throws Exception {
_contexts.scheduler.jobCompleted(jobInfo.jobName);
Date future = new Date(System.currentTimeMillis() +
(60 * 1000));
-
__log.info(__msgs.msgReschedulingJobForInactiveProcess(we.getProcessId(),
jobInfo.jobName, future));
+
__log.debug(__msgs.msgReschedulingJobForInactiveProcess(we.getProcessId(),
jobInfo.jobName, future));
_contexts.scheduler.schedulePersistedJob(we.getDetail(), future);
return null;
}
@@ -902,7 +902,7 @@
}
}
} catch (InterruptedException e) {
- __log.info(e);
+ __log.debug(e);
}
}
}
Modified:
ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/Contexts.java
URL:
http://svn.apache.org/viewvc/ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/Contexts.java?rev=748765&r1=748764&r2=748765&view=diff
==============================================================================
---
ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/Contexts.java
(original)
+++
ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/Contexts.java
Sat Feb 28 01:27:24 2009
@@ -81,12 +81,10 @@
public void execTransaction(final Runnable transaction) {
try {
execTransaction(new Callable<Void>() {
-
public Void call() throws Exception {
transaction.run();
return null;
}
-
});
} catch (Exception e) {
throw new BpelEngineException(e);
Modified:
ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
URL:
http://svn.apache.org/viewvc/ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java?rev=748765&r1=748764&r2=748765&view=diff
==============================================================================
---
ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
(original)
+++
ode/branches/restful/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
Sat Feb 28 01:27:24 2009
@@ -93,7 +93,10 @@
_pid = conf.getProcessId();
_pconf = conf;
_contexts = server._contexts;
- _inMemDao = conf.isTransient() ?
((BpelDAOConnectionFactoryImpl)_contexts.dao) : new
BpelDAOConnectionFactoryImpl(_contexts.txManager);
+ if (_contexts.dao instanceof BpelDAOConnectionFactoryImpl)
+ _inMemDao = (BpelDAOConnectionFactoryImpl) _contexts.dao;
+ else
+ _inMemDao = new BpelDAOConnectionFactoryImpl(_contexts.txManager);
_incomingMexCache = mexCache;
// TODO : do this on a per-partnerlink basis, support transacted
styles.
@@ -788,4 +791,4 @@
}
}
-}
\ No newline at end of file
+}
