--- a/jdk/test/sun/tools/jps/JpsBase.java	Fri Sep 04 09:31:47 2015 -0700
+++ b/jdk/test/sun/tools/jps/JpsBase.java	Fri Sep 04 12:18:03 2015 +0200
@@ -138,6 +138,8 @@
         String tmp = str.replace("\\", "\\\\");
         tmp = tmp.replace("+", "\\+");
         tmp = tmp.replace(".", "\\.");
+        tmp = tmp.replace("\n", "\\\\n");
+        tmp = tmp.replace("\r", "\\\\r");
         return tmp;
     }