MasterCodingPlus
diff --git a/‎src/main/java/com/profesorfalken/wmi4java/WMIPowerShell.java‎
Lines changed: 11 additions & 7 deletions b/‎src/main/java/com/profesorfalken/wmi4java/WMIPowerShell.java‎
Lines changed: 11 additions & 7 deletions
diff --git a/‎src/main/java/com/profesorfalken/wmi4java/WMIVBScript.java‎
Lines changed: 5 additions & 2 deletions b/‎src/main/java/com/profesorfalken/wmi4java/WMIVBScript.java‎
Lines changed: 5 additions & 2 deletions
@@ -25,12 +25,13 @@
 
 /**
  * WMI Stub implementation based in PowerShell (jPowerShell)
- * 
+ *
  * @author Javier Garcia Alonso
  */
 class WMIPowerShell implements WMIStub {
+
     private static final String NAMESPACE_PARAM = "-Namespace ";
-    private static final String GETWMIOBJECT_COMMAND = "Get-WMIObject ";    
+    private static final String GETWMIOBJECT_COMMAND = "Get-WMIObject ";
 
     private static String executeCommand(String command) throws WMIException {
         String commandResponse = null;
@@ -110,16 +111,19 @@ public String queryObject(String wmiClass, List<String> wmiProperties, List<Stri
         if (!"*".equals(namespace)) {
             command += NAMESPACE_PARAM + namespace;
         }
-        if(wmiProperties == null ||wmiProperties.isEmpty()){
-            wmiProperties = Collections.singletonList("*");
+        List<String> usedWMIProperties;
+        if (wmiProperties == null || wmiProperties.isEmpty()) {
+            usedWMIProperties = Collections.singletonList("*");
+        } else {
+            usedWMIProperties = wmiProperties;
         }
 
         command += " | ";
 
-        command += "Select-Object " + Joiner.on(", ").join(wmiProperties)+" -excludeproperty \"_*\" | ";
+        command += "Select-Object " + Joiner.on(", ").join(usedWMIProperties) + " -excludeproperty \"_*\" | ";
 
-        if(conditions!=null && !conditions.isEmpty()){
-            for(String condition : conditions) {
+        if (conditions != null && !conditions.isEmpty()) {
+            for (String condition : conditions) {
                 command += "Where-Object -FilterScript {" + condition + "} | ";
             }
         }
 
@@ -158,8 +158,11 @@ public String listObject(String wmiClass, String namespace, String computerName)
 
     @Override
     public String queryObject(String wmiClass, List<String> wmiProperties, List<String> conditions, String namespace, String computerName) throws WMIException {
+        List<String> usedWMIProperties;
         if (wmiProperties == null || wmiProperties.isEmpty()) {
-            wmiProperties = WMI4Java.get().VBSEngine().computerName(computerName).namespace(namespace).listProperties(wmiClass);
+            usedWMIProperties = WMI4Java.get().VBSEngine().computerName(computerName).namespace(namespace).listProperties(wmiClass);
+        } else {
+            usedWMIProperties = wmiProperties;
         }
         try {
             StringBuilder scriptCode = new StringBuilder(200);
@@ -181,7 +184,7 @@ public String queryObject(String wmiClass, List<String> wmiProperties, List<Stri
             }
             scriptCode.append("\")").append(CRLF);
             scriptCode.append("For Each element In wmiQueryData").append(CRLF);
-            for (final String wmiProperty : wmiProperties) {
+            for (final String wmiProperty : usedWMIProperties) {
                 scriptCode.append("Wscript.Echo \"").append(wmiProperty)
                         .append(": \" & ").append("element.").append(wmiProperty).append(CRLF);
             }