Resolving ServerTest conflict

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a50e7e75
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a50e7e75
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a50e7e75

Branch: refs/heads/master
Commit: a50e7e75f0b0e46c84bd3e591f1a4d690ee26b79
Parents: 5b6643f
Author: ajs6f <aj...@virginia.edu>
Authored: Thu Oct 13 16:20:56 2016 -0400
Committer: ajs6f <aj...@virginia.edu>
Committed: Thu Oct 13 16:20:56 2016 -0400

----------------------------------------------------------------------
 jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/a50e7e75/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java 
b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java
index 9ace6eb..bbde594 100644
--- a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java
+++ b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java
@@ -48,8 +48,8 @@ import org.apache.jena.update.UpdateProcessor ;
 public class ServerTest
 {
     // Abstraction that runs a SPARQL server for tests.
-    // Different to the Fuseki2 test ports.
     public static final int port             = choosePort() ;   // Different 
to the Fuseki2 test ports.
+
     public static final String urlRoot       = "http://localhost:"+port+"/"; ;
     public static final String datasetPath   = "/dataset" ;
     public static final String serviceUpdate = 
"http://localhost:"+port+datasetPath+"/update"; ; 
@@ -102,7 +102,6 @@ public class ServerTest
             server.stop() ;
         server = null ;
     }
-
     public static void resetServer()
     {
         if (countServer.get() == 0)  throw new RuntimeException("No server 
started!");

Reply via email to