Merge "Fixed the SDK Junits and cleaned unused code"

[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / controller / CreateFirewallController.java

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateFirewallController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateFirewallController.java
index 2750ff5..3e24dc7 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateFirewallController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateFirewallController.java
@@ -113,7 +113,9 @@ public class CreateFirewallController extends RestrictedBaseController {
                CreateFirewallController.commonClassDao = commonClassDao;
        }
 
-       public CreateFirewallController(){}
+       public CreateFirewallController(){
+               // Empty constructor
+       }
        private List<String> termCollectorList;
        
 
@@ -342,7 +344,7 @@ public class CreateFirewallController extends RestrictedBaseController {
                                jpaTermList = (TermList) tmList.get(0);
                                if (jpaTermList != null){                               
                                        ruleSrcList= jpaTermList.getSrcIPList();        
-                                       if ((ruleSrcList!= null) && (!ruleSrcList.isEmpty()) && !ruleSrcList.equals("null")){
+                                       if ((ruleSrcList!= null) && (!ruleSrcList.isEmpty()) && !"null".equals(ruleSrcList)){
                                                displayString.append("Source IP List: " + jpaTermList.getSrcIPList());
                                                displayString.append(" ; \t\n");
                                                for(String srcList:ruleSrcList.split(",")){