[freenet-cvs] r18913 - trunk/freenet/src/freenet/node

[toad at freenetproject.org]

Author: toad
Date: 2008-04-02 13:38:29 +0000 (Wed, 02 Apr 2008)
New Revision: 18913

Modified:
   trunk/freenet/src/freenet/node/SendableGet.java
Log:
indenting

Modified: trunk/freenet/src/freenet/node/SendableGet.java
===================================================================
--- trunk/freenet/src/freenet/node/SendableGet.java	2008-04-02 13:37:52 UTC (rev 18912)
+++ trunk/freenet/src/freenet/node/SendableGet.java	2008-04-02 13:38:29 UTC (rev 18913)
@@ -71,36 +71,36 @@
 			return false;
 		}
 		boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
-				if(isCancelled()) {
-					if(logMINOR) Logger.minor(this, "Cancelled: "+this);
-					onFailure(new LowLevelGetException(LowLevelGetException.CANCELLED), null, sched);
-					return false;
-				}
-			if(key == null) {
-				if(!isCancelled()) {
-					Logger.error(this, "Not cancelled but key "+keyNum+" is null?! on "+this);
-					return false;
-				}
+		if(isCancelled()) {
+			if(logMINOR) Logger.minor(this, "Cancelled: "+this);
+			onFailure(new LowLevelGetException(LowLevelGetException.CANCELLED), null, sched);
+			return false;
+		}
+		if(key == null) {
+			if(!isCancelled()) {
+				Logger.error(this, "Not cancelled but key "+keyNum+" is null?! on "+this);
+				return false;
 			}
+		}
+		try {
 			try {
-				try {
-					core.realGetKey(key, ctx.localRequestOnly, ctx.cacheLocalRequests, ctx.ignoreStore);
-				} catch (LowLevelGetException e) {
-					onFailure(e, keyNum, sched);
-					return true;
-				} catch (Throwable t) {
-					Logger.error(this, "Caught "+t, t);
-					onFailure(new LowLevelGetException(LowLevelGetException.INTERNAL_ERROR), keyNum, sched);
-					return true;
-				}
-				// Don't call onSuccess(), it will be called for us by backdoor coalescing.
-				sched.succeeded(this.getParentGrabArray());
+				core.realGetKey(key, ctx.localRequestOnly, ctx.cacheLocalRequests, ctx.ignoreStore);
+			} catch (LowLevelGetException e) {
+				onFailure(e, keyNum, sched);
+				return true;
 			} catch (Throwable t) {
 				Logger.error(this, "Caught "+t, t);
 				onFailure(new LowLevelGetException(LowLevelGetException.INTERNAL_ERROR), keyNum, sched);
 				return true;
 			}
+			// Don't call onSuccess(), it will be called for us by backdoor coalescing.
+			sched.succeeded(this.getParentGrabArray());
+		} catch (Throwable t) {
+			Logger.error(this, "Caught "+t, t);
+			onFailure(new LowLevelGetException(LowLevelGetException.INTERNAL_ERROR), keyNum, sched);
 			return true;
+		}
+		return true;
 	}
 
 	public void schedule() {