formatting only
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/9acdad25 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/9acdad25 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/9acdad25 Branch: refs/heads/blur-342a Commit: 9acdad2581c5a17dc1ebd457300739484b9cb69c Parents: bb119e6 Author: Tim <[email protected]> Authored: Thu Jul 17 10:38:32 2014 -0400 Committer: Tim <[email protected]> Committed: Wed Jul 23 16:06:08 2014 -0400 ---------------------------------------------------------------------- .../blur/thrift/ThriftBlurControllerServer.java | 18 +++++++++--------- .../apache/blur/thrift/ThriftBlurShardServer.java | 16 +++++++--------- 2 files changed, 16 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/9acdad25/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java index 03cfc26..7814582 100644 --- a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java +++ b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java @@ -93,8 +93,7 @@ public class ThriftBlurControllerServer extends ThriftServer { } } - public static ThriftServer createServer(int serverIndex, BlurConfiguration configuration) - throws Exception { + public static ThriftServer createServer(int serverIndex, BlurConfiguration configuration) throws Exception { Thread.setDefaultUncaughtExceptionHandler(new SimpleUncaughtExceptionHandler()); String bindAddress = configuration.get(BLUR_CONTROLLER_BIND_ADDRESS); int configBindPort = configuration.getInt(BLUR_CONTROLLER_BIND_PORT, -1); @@ -102,13 +101,14 @@ public class ThriftBlurControllerServer extends ThriftServer { if (configBindPort == 0) { instanceBindPort = 0; } - TNonblockingServerSocket tNonblockingServerSocket = ThriftServer.getTNonblockingServerSocket(bindAddress, instanceBindPort); + TNonblockingServerSocket tNonblockingServerSocket = ThriftServer.getTNonblockingServerSocket(bindAddress, + instanceBindPort); if (configBindPort == 0) { instanceBindPort = tNonblockingServerSocket.getServerSocket().getLocalPort(); } - LOG.info("Controller Server using index [{0}] bind address [{1}]", serverIndex, - bindAddress + ":" + instanceBindPort); + LOG.info("Controller Server using index [{0}] bind address [{1}]", serverIndex, bindAddress + ":" + + instanceBindPort); String nodeName = getNodeName(configuration, BLUR_CONTROLLER_HOSTNAME); nodeName = nodeName + ":" + instanceBindPort; @@ -176,11 +176,11 @@ public class ThriftBlurControllerServer extends ThriftServer { int configGuiPort = Integer.parseInt(configuration.get(BLUR_GUI_CONTROLLER_PORT)); int instanceGuiPort = configGuiPort + serverIndex; - - if(configGuiPort == 0) { - instanceGuiPort = 0; + + if (configGuiPort == 0) { + instanceGuiPort = 0; } - + final HttpJettyServer httpServer; if (configGuiPort >= 0) { httpServer = new HttpJettyServer(HttpJettyServer.class, instanceGuiPort); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/9acdad25/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java index 179d0f0..195eb5e 100644 --- a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java +++ b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java @@ -130,8 +130,7 @@ public class ThriftBlurShardServer extends ThriftServer { } } - public static ThriftServer createServer(int serverIndex, BlurConfiguration configuration) - throws Exception { + public static ThriftServer createServer(int serverIndex, BlurConfiguration configuration) throws Exception { Configuration config = new Configuration(); TableContext.setSystemBlurConfiguration(configuration); TableContext.setSystemConfiguration(config); @@ -142,12 +141,12 @@ public class ThriftBlurShardServer extends ThriftServer { if (configBindPort == 0) { instanceBindPort = 0; } - TNonblockingServerSocket tNonblockingServerSocket = ThriftServer.getTNonblockingServerSocket(bindAddress, instanceBindPort); + TNonblockingServerSocket tNonblockingServerSocket = ThriftServer.getTNonblockingServerSocket(bindAddress, + instanceBindPort); if (configBindPort == 0) { instanceBindPort = tNonblockingServerSocket.getServerSocket().getLocalPort(); } - Set<Entry<String, String>> set = configuration.getProperties().entrySet(); for (Entry<String, String> e : set) { String key = e.getKey(); @@ -171,8 +170,7 @@ public class ThriftBlurShardServer extends ThriftServer { } else { throw new RuntimeException("Unknown block cache version [" + blockCacheVersion + "] can be [v1,v2]"); } - LOG.info("Shard Server using index [{0}] bind address [{1}]", serverIndex, bindAddress - + ":" + instanceBindPort); + LOG.info("Shard Server using index [{0}] bind address [{1}]", serverIndex, bindAddress + ":" + instanceBindPort); String nodeNameHostName = getNodeName(configuration, BLUR_SHARD_HOSTNAME); String nodeName = nodeNameHostName + ":" + instanceBindPort; @@ -252,11 +250,11 @@ public class ThriftBlurShardServer extends ThriftServer { int configGuiPort = Integer.parseInt(configuration.get(BLUR_GUI_SHARD_PORT)); int instanceGuiPort = configGuiPort + serverIndex; - - if(configGuiPort == 0) { + + if (configGuiPort == 0) { instanceGuiPort = 0; } - + final HttpJettyServer httpServer; if (configGuiPort >= 0) { httpServer = new HttpJettyServer(HttpJettyServer.class, instanceGuiPort);
