From e110d853d166cd2270e269e964901dcf20a1980b Mon Sep 17 00:00:00 2001
From: Nate Jensen <Nathan.Jensen@raytheon.com>
Date: Mon, 9 Jun 2014 16:31:07 -0500
Subject: [PATCH] Omaha #3027 fix logservice's build script and reconnect logic
 if error occurs

Change-Id: Ic389fe690c832505ab044996a2d9d7d16e535616

Former-commit-id: 3583bda1f0a137e3eeae64bd1cfb90505207d9aa [formerly 5edfea458220da1f15875eba30aa4043e6f99cdf] [formerly 3583bda1f0a137e3eeae64bd1cfb90505207d9aa [formerly 5edfea458220da1f15875eba30aa4043e6f99cdf] [formerly a9d6a75a6202df26279c50ebe32c800f4e530377 [formerly bba5e64230d90d5c36bb9a4498db8c9eff945157]]]
Former-commit-id: a9d6a75a6202df26279c50ebe32c800f4e530377
Former-commit-id: aa86a7537b8bd5ac8963c717cec3c53d54149adc [formerly 4011b49c8f4ea4234d813ddbf8b86eeea787d46b]
Former-commit-id: e7827132b6e199e933dbb4b2f2e6858e24b56712
---
 javaUtilities/com.raytheon.uf.logsrv/build.xml    | 15 ++++++++-------
 .../raytheon/uf/logsrv/derby/DerbyAppender.java   |  3 ++-
 .../com/raytheon/uf/logsrv/derby/DerbyDao.java    |  6 +++++-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/javaUtilities/com.raytheon.uf.logsrv/build.xml b/javaUtilities/com.raytheon.uf.logsrv/build.xml
index 228ec71040..028ac1827e 100644
--- a/javaUtilities/com.raytheon.uf.logsrv/build.xml
+++ b/javaUtilities/com.raytheon.uf.logsrv/build.xml
@@ -19,7 +19,8 @@
 -->
 <project name="com.raytheon.uf.logsrv" default="dist">
   
-  <property name="foss" location="../../cots/"/>
+  <property name="corefoss" location="../../../ufcore-foss/lib/"/>
+  <property name="a2foss" location="../../../AWIPS2_foss/lib/"/>
   <property name="src" location="src"/>
   <property name="bin" location="bin"/>
   <property name="qualifier" value="${date}"/>
@@ -66,24 +67,24 @@
 	
 	<target name="tar" depends="build">
 		<tar destfile="${ant.project.name}-${Bundle-Version}.tar.gz" compression="gzip">
-			<tarfileset dir="${foss}/org.slf4j" prefix="${prefix}/lib/">
+			<tarfileset dir="${corefoss}/org.slf4j" prefix="${prefix}/lib/">
 			   <include name="slf4j-api*.jar"/>
 				<exclude name="*sources.jar"/>
 			</tarfileset>
-			<tarfileset dir="${foss}/ch.qos.logback" prefix="${prefix}/lib/">
+			<tarfileset dir="${corefoss}/ch.qos.logback" prefix="${prefix}/lib/">
 			    <include name="logback*.jar"/>
 				<exclude name="*sources.jar"/>
 			</tarfileset>
-            <tarfileset dir="${foss}/org.apache.derby" prefix="${prefix}/lib/">
+            <tarfileset dir="${a2foss}/org.apache.derby" prefix="${prefix}/lib/">
                <include name="derby*.jar"/>
             </tarfileset>
-            <tarfileset dir="${foss}/javax.mail" prefix="${prefix}/lib/">
+            <tarfileset dir="${a2foss}/javax.mail" prefix="${prefix}/lib/">
                <include name="mail.jar"/>
             </tarfileset>
-            <tarfileset dir="${foss}/org.quartz" prefix="${prefix}/lib/">
+            <tarfileset dir="${corefoss}/org.quartz" prefix="${prefix}/lib/">
                    <include name="quartz*.jar"/>
             </tarfileset>			
-            <tarfileset dir="${foss}/org.apache.commons.lang" prefix="${prefix}/lib/">
+            <tarfileset dir="${corefoss}/org.apache.commons.lang" prefix="${prefix}/lib/">
                <include name="commons-lang*.jar"/>
             </tarfileset>
             <tarfileset dir="./" prefix="${prefix}/lib/">
diff --git a/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/derby/DerbyAppender.java b/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/derby/DerbyAppender.java
index 0108340465..d7b5598018 100644
--- a/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/derby/DerbyAppender.java
+++ b/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/derby/DerbyAppender.java
@@ -36,6 +36,7 @@ import com.raytheon.uf.logsrv.StoredMsg;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Aug 27, 2013            njensen     Initial creation
+ * Jun 09, 2014 3027       njensen     Change shouldStoreMsg() to protected
  * 
  * </pre>
  * 
@@ -71,7 +72,7 @@ public class DerbyAppender extends AppenderBase<ILoggingEvent> {
      * @param event
      * @return
      */
-    private boolean shouldStoreMsg(ILoggingEvent event) {
+    protected boolean shouldStoreMsg(ILoggingEvent event) {
         return true;
     }
 }
diff --git a/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/derby/DerbyDao.java b/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/derby/DerbyDao.java
index 521d5744be..e44eab6a61 100644
--- a/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/derby/DerbyDao.java
+++ b/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/derby/DerbyDao.java
@@ -46,6 +46,7 @@ import com.raytheon.uf.logsrv.report.data.LogReportEvent;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Aug 27, 2013            njensen     Initial creation
+ * Jun 09, 2014 3027       njensen     Fix reconnect after error logic
  * 
  * </pre>
  * 
@@ -269,7 +270,10 @@ public class DerbyDao {
             } catch (SQLException e) {
                 // ignore
             }
-            connection = null;
+            if (connection.equals(this.connection)) {
+                this.connection = null;
+            }
+
         }
 
         try {