bug[ats_ATS81092]: Fix null property errors

2 files changed, 15 insertions, 4 deletions

diff --git a/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteService.java b/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteService.java
index 9ff7a3027a6..769c3dd548f 100644
--- a/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteService.java
+++ b/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteService.java
@@ -74,7 +74,11 @@ public class OteService implements IHostTestEnvironment, IService {
       enhancedProperties.setProperty("owner", System.getProperty("user.name"));
       enhancedProperties.setProperty("id", serviceID.toString());
       try {
-         enhancedProperties.setProperty("appServerURI", String.format("http://%s:%s", InetAddress.getLocalHost().getHostAddress(), Integer.parseInt(System.getProperty("org.osgi.service.http.port"))));
+         if(System.getProperty("org.osgi.service.http.port") == null){
+            enhancedProperties.setProperty("appServerURI", String.format("http://%s:%s", InetAddress.getLocalHost().getHostAddress(), 80));
+         } else {
+            enhancedProperties.setProperty("appServerURI", String.format("http://%s:%s", InetAddress.getLocalHost().getHostAddress(), Integer.parseInt(System.getProperty("org.osgi.service.http.port"))));
+         }
       } catch (Exception e) {
          OseeLog.log(OteService.class, Level.SEVERE, "Failed to set the appServerURI", e);
       }
diff --git a/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteServiceStarterImpl.java b/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteServiceStarterImpl.java
index 57dfa339767..c9ede08d91e 100644
--- a/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteServiceStarterImpl.java
+++ b/plugins/org.eclipse.osee.ote.server/src/org/eclipse/osee/ote/server/internal/OteServiceStarterImpl.java
@@ -161,9 +161,12 @@ public class OteServiceStarterImpl implements OteServiceStarter, ServiceInfoPopu
 		if (service != null) {
 			throw new OseeStateException("An ote Server has already been started.");
 		}
-
 		this.serviceSideConnector = serviceSideConnector;
-		System.out.printf("BETA SERVER URL[http://%s:%s/ote]\n", InetAddress.getLocalHost().getHostAddress(), Integer.parseInt(System.getProperty("org.osgi.service.http.port")));
+		if(System.getProperty("org.osgi.service.http.port") == null){
+		   System.out.println("Property org.osgi.service.http.port was not set, it will default to port 80.");
+		} else {
+		   System.out.printf("BETA SERVER URL[http://%s:%s/ote]\n", InetAddress.getLocalHost().getHostAddress(), Integer.parseInt(System.getProperty("org.osgi.service.http.port")));
+		}
 		brokerService = new BrokerService();
 
 		String strUri;
@@ -248,7 +251,11 @@ public class OteServiceStarterImpl implements OteServiceStarter, ServiceInfoPopu
 	   server.setStartTime(new Date().toString());
 	   server.setOwner(System.getProperty("user.name"));
 	   server.setUUID(uuid);
-	   server.setOteRestServer(String.format("http://%s:%s", InetAddress.getLocalHost().getHostAddress(), Integer.parseInt(System.getProperty("org.osgi.service.http.port"))));
+	   if(System.getProperty("org.osgi.service.http.port") == null){
+	      server.setOteRestServer(String.format("http://%s:%s", InetAddress.getLocalHost().getHostAddress(), 80));
+	   } else {
+	      server.setOteRestServer(String.format("http://%s:%s", InetAddress.getLocalHost().getHostAddress(), Integer.parseInt(System.getProperty("org.osgi.service.http.port"))));
+	   }
 	   server.setOteActivemqServer(nodeInfo.getUri().toString());
 	   return server;
 	}