Return-Path: Delivered-To: apmail-ode-commits-archive@www.apache.org Received: (qmail 28586 invoked from network); 26 Jun 2009 20:51:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Jun 2009 20:51:24 -0000 Received: (qmail 98744 invoked by uid 500); 26 Jun 2009 20:51:35 -0000 Delivered-To: apmail-ode-commits-archive@ode.apache.org Received: (qmail 98696 invoked by uid 500); 26 Jun 2009 20:51:35 -0000 Mailing-List: contact commits-help@ode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ode.apache.org Delivered-To: mailing list commits@ode.apache.org Received: (qmail 98685 invoked by uid 99); 26 Jun 2009 20:51:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Jun 2009 20:51:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Jun 2009 20:51:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7351A23888A2; Fri, 26 Jun 2009 20:51:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r788868 - /ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Date: Fri, 26 Jun 2009 20:51:11 -0000 To: commits@ode.apache.org From: seanahn@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090626205111.7351A23888A2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seanahn Date: Fri Jun 26 20:51:11 2009 New Revision: 788868 URL: http://svn.apache.org/viewvc?rev=788868&view=rev Log: clean up process on deployment of a new process Modified: ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Modified: ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?rev=788868&r1=788867&r2=788868&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java (original) +++ ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Fri Jun 26 20:51:11 2009 @@ -595,6 +595,17 @@ __log.debug("Process store event: " + pse); ProcessConf pconf = _store.getProcessConfiguration(pse.pid); switch (pse.type) { + case DEPLOYED: + if (pconf != null) { + /* + * If and only if an old process exists with the same pid, the old process is cleaned up. + * The following line is IMPORTANT and used for the case when the deployment and store + * do not have the process while the process itself exists in the BPEL_PROCESS table. + * Notice that the new process is actually created on the 'ACTIVATED' event. + */ + _bpelServer.cleanupProcess(pconf); + } + break; case ACTVIATED: // bounce the process _bpelServer.unregister(pse.pid);