You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/03/15 02:19:45 UTC
svn commit: r1456741 - in /accumulo/trunk: ./ assemble/ core/ examples/
fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/
server/src/main/java/org/apache/accumulo/server/master/recovery/ src/
Author: kturner
Date: Fri Mar 15 01:19:45 2013
New Revision: 1456741
URL: http://svn.apache.org/r1456741
Log:
ACCUMULO-1169 A much easier solution to differing "throws" declarations is to just not be specific about the Exception being thrown.
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1455321-1455613,1455615-1455640,1455642-1455983,1455985-1456460,1456462-1456737,1456739
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1455321-1455613,1455615-1455640,1455642-1455983,1455985-1456460,1456462-1456737,1456739
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1456004-1456460,1456462-1456737,1456739
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1455321-1455613,1455615-1455640,1455642-1455983,1455985-1456460,1456462-1456737,1456739
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1455321-1455613,1455615-1455640,1455642-1455983,1455985-1456460,1456462-1456737,1456739
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1455321-1455613,1455615-1455640,1455642-1455983,1455985-1456460,1456462-1456737,1456739
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1455321-1455613,1455615-1455640,1455642-1455983,1455985-1456460,1456462-1456737,1456739
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java?rev=1456741&r1=1456740&r2=1456741&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java Fri Mar 15 01:19:45 2013
@@ -24,7 +24,7 @@ public class HadoopLogCloser implements
}
log.info("Recovered lease on " + source.toString());
return 0;
- } catch (IOException ex) {
+ } catch (Exception ex) {
log.warn("Error recovery lease on " + source.toString(), ex);
}
} else if (fs instanceof LocalFileSystem) {
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1455321-1455613,1455615-1455640,1455642-1455983,1455985-1456460,1456462-1456737,1456739