From e1d7556e846b33d5a299961f921dd7833028816c Mon Sep 17 00:00:00 2001
From: Simon Pamies <spamsch@gmail.com>
Date: Wed, 19 Jun 2013 16:15:17 +0200
Subject: [PATCH] Removing unneeded check - classloader reset needs to take
 place at every step

---
 .../com/sap/sailing/server/replication/impl/Replicator.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/Replicator.java b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/Replicator.java
index 5af96a3c75d..e1ee6ea89fa 100755
--- a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/Replicator.java
+++ b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/Replicator.java
@@ -83,7 +83,6 @@ public class Replicator implements Runnable {
         ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
         
         while (true) {
-            boolean noClassLoaderReset = false;
             try {
                 Delivery delivery = consumer.nextDelivery();
                 byte[] bytesFromMessage = delivery.getBody();
@@ -121,7 +120,6 @@ public class Replicator implements Runnable {
                         eir.printStackTrace();
                     }
                     checksPerformed += 1;
-                    noClassLoaderReset = true;
                     continue;
                 } else {
                     logger.severe("Grace time (" + CHECK_COUNT*(CHECK_INTERVAL/1000) + "secs) is over. Terminating replication listener " + this.toString());
@@ -132,9 +130,7 @@ public class Replicator implements Runnable {
                 logger.info("Exception while processing replica: "+e.getMessage());
                 logger.log(Level.SEVERE, "run", e);
             } finally {
-                if (noClassLoaderReset == false) {
-                    Thread.currentThread().setContextClassLoader(oldClassLoader);
-                }
+                Thread.currentThread().setContextClassLoader(oldClassLoader);
             }
         }
     }