Repository: incubator-juneau Updated Branches: refs/heads/master 488136921 -> 1dab7d84c
Fix whitespace. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/1dab7d84 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/1dab7d84 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/1dab7d84 Branch: refs/heads/master Commit: 1dab7d84c6a15b11426a580f26d0fbbf36da7c41 Parents: 4881369 Author: JamesBognar <[email protected]> Authored: Fri Apr 7 14:15:18 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Fri Apr 7 14:15:18 2017 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/juneau/microservice/Microservice.java | 4 ++-- .../java/org/apache/juneau/microservice/RestMicroservice.java | 4 ++-- .../java/org/apache/juneau/microservice/resources/LogParser.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/1dab7d84/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java index e8ce3f5..b96f01b 100755 --- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java +++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java @@ -139,7 +139,7 @@ public abstract class Microservice { * Specifies the config file for this microservice. * <p> * Note that if you use this method instead of {@link #setConfig(String,boolean)}, the config file will not use - * the variable resolver constructed from {@link #createVarResolver()}. + * the variable resolver constructed from {@link #createVarResolver()}. * * @param cf The config file for this application, or <jk>null</jk> if no config file is needed. * @return This object (for method chaining). @@ -439,7 +439,7 @@ public abstract class Microservice { // Resolve the config file if the path was specified. // -------------------------------------------------------------------------------- ConfigFileBuilder cfb = new ConfigFileBuilder(); - if (cfPath != null) + if (cfPath != null) cf = cfb.build(cfPath).getResolving(createVarResolver().build()); // -------------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/1dab7d84/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java index 292e99f..050ec1a 100755 --- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java +++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java @@ -296,7 +296,7 @@ public class RestMicroservice extends Microservice { * * <cc># The context root of the Jetty server. * # Default is Rest-ContextPath in manifest file, or "/".</cc> - * <ck>contextPath</ck> = + * <ck>contextPath</ck> = * * <cc># Authentication: NONE, BASIC. * # Default is Rest-AuthType in manifest file, or NONE.</cc> @@ -398,7 +398,7 @@ public class RestMicroservice extends Microservice { for (int port : ports) { try { // If port is 0, try a random port between ports[0] and 32767. - if (port == 0) + if (port == 0) port = new Random().nextInt(32767 - ports[0] + 1) + ports[0]; ServerSocket ss = new ServerSocket(port); ss.close(); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/1dab7d84/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogParser.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogParser.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogParser.java index 50b6999..e271c1c 100644 --- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogParser.java +++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogParser.java @@ -82,7 +82,7 @@ public class LogParser implements Iterable<LogParser.Entry>, Iterator<LogParser. if (e.matches()) next = e; prev = null; - } else { + } else { if (prev != null) prev.addText(e.line); }
