lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject svn commit: r1580295 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Date Sat, 22 Mar 2014 19:36:22 GMT
Author: shalin
Date: Sat Mar 22 19:36:22 2014
New Revision: 1580295

URL: http://svn.apache.org/r1580295
Log:
Merging r1580294 from trunk - Don't swallow exception in getLatestVersion. Refactored some
odd if conditions.

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java?rev=1580295&r1=1580294&r2=1580295&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
(original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Sat Mar 22 19:36:22 2014
@@ -251,7 +251,7 @@ public class SnapPuller {
       
       rsp = server.request(req);
     } catch (SolrServerException e) {
-      throw new SolrException(ErrorCode.SERVER_ERROR, e.getMessage());
+      throw new SolrException(ErrorCode.SERVER_ERROR, e.getMessage(), e);
     } finally {
       server.shutdown();
     }
@@ -883,9 +883,8 @@ public class SnapPuller {
       File oldFile = new File(confDir, file.getPath().substring(tmpconfDir.getPath().length(),
file.getPath().length()));
       if (!oldFile.getParentFile().exists()) {
         status = oldFile.getParentFile().mkdirs();
-        if (status) {
-        } else {
-          throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
+        if (!status) {
+          throw new SolrException(ErrorCode.SERVER_ERROR,
                   "Unable to mkdirs: " + oldFile.getParentFile());
         }
       }
@@ -893,9 +892,8 @@ public class SnapPuller {
         File backupFile = new File(oldFile.getPath() + "." + getDateAsStr(new Date(oldFile.lastModified())));
         if (!backupFile.getParentFile().exists()) {
           status = backupFile.getParentFile().mkdirs();
-          if (status) {
-          } else {
-            throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
+          if (!status) {
+            throw new SolrException(ErrorCode.SERVER_ERROR,
                     "Unable to mkdirs: " + backupFile.getParentFile());
           }
         }
@@ -906,9 +904,8 @@ public class SnapPuller {
         }
       }
       status = file.renameTo(oldFile);
-      if (status) {
-      } else {
-        throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
+      if (!status) {
+        throw new SolrException(ErrorCode.SERVER_ERROR,
                 "Unable to rename: " + file + " to: " + oldFile);
       }
     }



Mime
View raw message