bug6117 aftermath: migrating finalize() in ReplicationServiceImpl into stop() called by Activator.stop()

java/com.sap.sse.replication/src/com/sap/sse/replication/impl/Activator.java

@@ -224,6 +224,7 @@ public class Activator implements BundleActivator {
         }
         // stop sending stuff to the exchange for other replicas (if this is a master)
         serverReplicationMasterService.stopAllReplicas();
+        serverReplicationMasterService.stop();
     }
     
     public static BundleContext getDefaultContext() {

java/com.sap.sse.replication/src/com/sap/sse/replication/impl/ReplicationServiceImpl.java

@@ -353,12 +353,6 @@ public class ReplicationServiceImpl implements ReplicationService, OperationsToM
         }
     }
 
-    @Override
-    protected void finalize() {
-        logger.info("terminating timer " + timer);
-        timer.cancel();
-    }
-
     protected ServiceTracker<Replicable<?, ?>, Replicable<?, ?>> getReplicableTracker() {
         return new ServiceTracker<Replicable<?, ?>, Replicable<?, ?>>(Activator.getDefaultContext(),
                 Replicable.class.getName(), null);
@@ -968,4 +962,9 @@ public class ReplicationServiceImpl implements ReplicationService, OperationsToM
         return new ReplicationStatusImpl(isReplica, ServerInfo.getName(), isReplicationStarting, suspended, stopped,
                 messageQueueLength, isInitialLoadRunning, operationQueueLengths, getReplicatingFromMaster(), getReplicaInfo(), exchangeName, exchangePort);
     }
+
+    public void stop() {
+        logger.info("terminating timer " + timer);
+        timer.cancel();
+    }
 }