svn commit: r728884 - /lucene/solr/trunk/src/java/org/apache/solr/handler/SnapPuller.java

[shalin]

Author: shalin
Date: Mon Dec 22 22:36:30 2008
New Revision: 728884

URL: http://svn.apache.org/viewvc?rev=728884&view=rev
Log:
Simplifying the logic

Modified:
    lucene/solr/trunk/src/java/org/apache/solr/handler/SnapPuller.java

Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/SnapPuller.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/SnapPuller.java?rev=728884&r1=728883&r2=728884&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/SnapPuller.java 
(original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/SnapPuller.java Mon Dec 
22 22:36:30 2008
@@ -319,37 +319,19 @@
       if (f.exists()) {
         inFile = new FileInputStream(f);
         props.load(inFile);
-        if (!props.isEmpty()) {
-          if (props.containsKey("timesIndexReplicated"))
-            indexCount = 
Integer.valueOf(props.getProperty("timesIndexReplicated")) + 1;
-
-          props.setProperty("timesIndexReplicated", 
String.valueOf(indexCount));
-          props.setProperty("indexReplicatedAt", 
String.valueOf(replicationTime));
-
-          if (modifiedConfFiles != null && !modifiedConfFiles.isEmpty()) {
-            props.setProperty("confFilesReplicated", confFiles.toString());
-            props.setProperty("confFilesReplicatedAt", 
String.valueOf(replicationTime));
-            if (props.containsKey("timesConfigReplicated"))
-              confFilesCount = 
Integer.valueOf(props.getProperty("timesConfigReplicated")) + 1;
-            props.setProperty("timesConfigReplicated", 
String.valueOf(confFilesCount));
-          }
-        } else {
-          props.setProperty("timesIndexReplicated", 
String.valueOf(indexCount));
-          props.setProperty("indexReplicatedAt", 
String.valueOf(replicationTime));
-          if (modifiedConfFiles != null && !modifiedConfFiles.isEmpty()) {
-            props.setProperty("confFilesReplicated", confFiles.toString());
-            props.setProperty("confFilesReplicatedAt", 
String.valueOf(replicationTime));
-            props.setProperty("timesConfigReplicated", 
String.valueOf(confFilesCount));
-          }
-        }
-      } else {
-        props.setProperty("timesIndexReplicated", String.valueOf(indexCount));
-        props.setProperty("indexReplicatedAt", 
String.valueOf(replicationTime));
-        if (modifiedConfFiles != null && !modifiedConfFiles.isEmpty()) {
-          props.setProperty("confFilesReplicated", confFiles.toString());
-          props.setProperty("confFilesReplicatedAt", 
String.valueOf(replicationTime));
-          props.setProperty("timesConfigReplicated", 
String.valueOf(confFilesCount));
+      }
+      if (props.containsKey("timesIndexReplicated")) {
+        indexCount = 
Integer.valueOf(props.getProperty("timesIndexReplicated")) + 1;
+      }
+      props.setProperty("timesIndexReplicated", String.valueOf(indexCount));
+      props.setProperty("indexReplicatedAt", String.valueOf(replicationTime));
+      if (modifiedConfFiles != null && !modifiedConfFiles.isEmpty()) {
+        props.setProperty("confFilesReplicated", confFiles.toString());
+        props.setProperty("confFilesReplicatedAt", 
String.valueOf(replicationTime));
+        if (props.containsKey("timesConfigReplicated")) {
+          confFilesCount = 
Integer.valueOf(props.getProperty("timesConfigReplicated")) + 1;
         }
+        props.setProperty("timesConfigReplicated", 
String.valueOf(confFilesCount));
       }
       outFile = new FileOutputStream(f);
       props.store(outFile, "Replication details");