formatting

Nathan Marz · Nathan Marz · commit bc104ce6519b · 2011-11-20T15:35:18.000-08:00
diff --git a/src/jvm/backtype/storm/serialization/KryoFactory.java b/src/jvm/backtype/storm/serialization/KryoFactory.java
@@ -39,6 +39,7 @@ public static ObjectBuffer getKryo(Map conf) {
         k.register(ArrayList.class);
         k.register(HashMap.class);
         k.register(HashSet.class);
+        // TODO: do clojure persistent data structures
         Map<String, String> registrations = (Map<String, String>) conf.get(Config.TOPOLOGY_KRYO_REGISTER);
         if(registrations==null) registrations = new HashMap<String, String>();
         boolean skipMissing = (Boolean) conf.get(Config.TOPOLOGY_SKIP_MISSING_KRYO_REGISTRATIONS);
@@ -66,8 +67,7 @@ public static ObjectBuffer getKryo(Map conf) {
             } catch (IllegalAccessException e) {
                 throw new RuntimeException(e);                
             }
-        }                
-        // TODO: do clojure persistent data structures
+        }
         k.overrideDefault(true);
         return new ObjectBuffer(k, 2000, 2000000000);        
     }
diff --git a/src/jvm/backtype/storm/task/OutputCollectorImpl.java b/src/jvm/backtype/storm/task/OutputCollectorImpl.java
@@ -50,7 +50,7 @@ private Tuple anchorTuple(Collection<Tuple> anchors, int streamId, List<Object>
                 for(long root: anchor.getMessageId().getAnchorsToIds().keySet()) {
                     Long curr = anchorsToIds.get(root);
                     if(curr == null) curr = 0L;
-                    anchorsToIds.put(root, curr ^ newId);                
+                    anchorsToIds.put(root, curr ^ newId);
                 }
             }
         }
diff --git a/src/jvm/backtype/storm/utils/Utils.java b/src/jvm/backtype/storm/utils/Utils.java
@@ -9,7 +9,6 @@
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.InputStreamReader;
-import java.io.InputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ private Tuple anchorTuple(Collection<Tuple> anchors, int streamId, List<Object>`
`50`	`50`	`for(long root: anchor.getMessageId().getAnchorsToIds().keySet()) {`
`51`	`51`	`Long curr = anchorsToIds.get(root);`
`52`	`52`	`if(curr == null) curr = 0L;`
`53`		`- anchorsToIds.put(root, curr ^ newId);`
	`53`	`+ anchorsToIds.put(root, curr ^ newId);`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`}`