From 30067d2f53b30311b5a0c213e350f69f394c9565 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <ajbeamon@apple.com>
Date: Fri, 5 Jan 2018 13:21:54 -0800
Subject: [PATCH] Whitespace fixes and removal of change to java's
 AbstractTester

---
 .../foundationdb/test/AbstractTester.java     |  3 +-
 fdbclient/vexillographer/vexillographer.cs    | 42 +++++++++----------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/bindings/java/src/test/com/apple/foundationdb/test/AbstractTester.java b/bindings/java/src/test/com/apple/foundationdb/test/AbstractTester.java
index 8bbd4d2b04..d98521aa83 100644
--- a/bindings/java/src/test/com/apple/foundationdb/test/AbstractTester.java
+++ b/bindings/java/src/test/com/apple/foundationdb/test/AbstractTester.java
@@ -92,8 +92,7 @@ public abstract class AbstractTester {
             if (!args.useExternalClient()) {
                 throw new IllegalArgumentException("Cannot enable callbacks on external thread without using external client");
             }
-            throw new IllegalArgumentException("Cannot enable callbacks on external thread in Java");
-            //fdb.options().setCallbacksOnExternalThreads();
+            fdb.options().setCallbacksOnExternalThreads();
         }
         if (args.useExternalClient()) {
             fdb.options().setDisableLocalClient();
diff --git a/fdbclient/vexillographer/vexillographer.cs b/fdbclient/vexillographer/vexillographer.cs
index 5582638a40..f0bcc5af6b 100644
--- a/fdbclient/vexillographer/vexillographer.cs
+++ b/fdbclient/vexillographer/vexillographer.cs
@@ -132,28 +132,28 @@ namespace vexillographer
                     {
                         var paramTypeStr = oDoc.AttributeOrNull("paramType");
                         ParamType p = paramTypeStr == null ? ParamType.None : (ParamType)Enum.Parse(typeof(ParamType), paramTypeStr);
-						bool hidden = oDoc.AttributeOrNull("hidden") == "true";
-						string disableOn = oDoc.AttributeOrNull("disableOn");
-						bool disabled = false;
-						if(disableOn != null)
-						{
-							string[] disabledBindings = disableOn.Split(',');
-							disabled = disabledBindings.Contains(binding);
-						}
+                        bool hidden = oDoc.AttributeOrNull("hidden") == "true";
+                        string disableOn = oDoc.AttributeOrNull("disableOn");
+                        bool disabled = false;
+                        if(disableOn != null)
+                        {
+                            string[] disabledBindings = disableOn.Split(',');
+                            disabled = disabledBindings.Contains(binding);
+                        }
 
-						if (!disabled)
-						{
-							list.Add(new Option
-							{
-								scope = s,
-								name = oDoc.AttributeNonNull("name"),
-								code = int.Parse(oDoc.AttributeNonNull("code")),
-								paramType = p,
-								paramDesc = oDoc.AttributeOrNull("paramDescription"),
-								comment = oDoc.AttributeOrNull("description"),
-								hidden = hidden
-							});
-						}
+                        if (!disabled)
+                        {
+                            list.Add(new Option
+                            {
+                                scope = s,
+                                name = oDoc.AttributeNonNull("name"),
+                                code = int.Parse(oDoc.AttributeNonNull("code")),
+                                paramType = p,
+                                paramDesc = oDoc.AttributeOrNull("paramDescription"),
+                                comment = oDoc.AttributeOrNull("description"),
+                                hidden = hidden
+                            });
+                        }
                     }
                 }
                 options = list;