Merge from branche 3.3

zhourenjian · zhourenjian · commit 1e52797b2491 · 2007-10-01T03:24:02.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/ASTVariableVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTVariableVisitor.java
@@ -204,6 +204,20 @@ protected String checkConstantValue(Expression node) {
 			}
 			return buffer.toString();
 		}
+		if (constValue != null && (constValue instanceof String)) {
+			StringBuffer buffer = new StringBuffer();
+			String str = (String) constValue;
+			if (str.length() > 20) {
+				return null;
+			}
+			buffer.append("\"");
+			buffer.append(str.replaceAll("\\\\", "\\\\\\\\")
+					.replaceAll("\r", "\\\\r")
+					.replaceAll("\n", "\\\\n")
+					.replaceAll("\"", "\\\\\""));
+			buffer.append("\"");
+			return buffer.toString();
+		}
 		return null;
 	}
 }
diff --git a/src/net/sf/j2s/core/hotspot/HotspotWorker.java b/src/net/sf/j2s/core/hotspot/HotspotWorker.java
@@ -174,31 +174,31 @@ void sendLatestHotspot(long session, PrintStream ps) throws IOException {
         ps.write(EOL);
         StringBuffer strBuf = new StringBuffer();
         strBuf.append("ClazzLoader.updateHotspot (");
-        long time = new Date().getTime();
-        while (new Date().getTime() - time < 5000) {
+//        long time = new Date().getTime();
+//        while (new Date().getTime() - time < 5000) {
 	        String hotspotJS = InnerHotspotServer.getHotspotJavaScript(session);
 	        if (hotspotJS.length() != 0) {
 	        	strBuf.append("\r\n");
 	        	strBuf.append(hotspotJS);
-	        	break;
-	        } else {
-	        	Thread thread = new Thread(new Runnable() {
-					public void run() {
-						try {
-							Thread.sleep(250);
-						} catch (InterruptedException e) {
-							e.printStackTrace();
-						}
-					}
-				});
-	        	thread.start();
-	        	try {
-					thread.join();
-				} catch (InterruptedException e) {
-					e.printStackTrace();
-				}
+//	        	break;
+//	        } else {
+//	        	Thread thread = new Thread(new Runnable() {
+//					public void run() {
+//						try {
+//							Thread.sleep(250);
+//						} catch (InterruptedException e) {
+//							e.printStackTrace();
+//						}
+//					}
+//				});
+//	        	thread.start();
+//	        	try {
+//					thread.join();
+//				} catch (InterruptedException e) {
+//					e.printStackTrace();
+//				}
 	        }
-        }
+//        }
         strBuf.append("null);");
         ps.write(strBuf.toString().getBytes("utf-8"));
     }

Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,20 @@ protected String checkConstantValue(Expression node) {`
`204`	`204`	`}`
`205`	`205`	`return buffer.toString();`
`206`	`206`	`}`
	`207`	`+ if (constValue != null && (constValue instanceof String)) {`
	`208`	`+ StringBuffer buffer = new StringBuffer();`
	`209`	`+ String str = (String) constValue;`
	`210`	`+ if (str.length() > 20) {`
	`211`	`+ return null;`
	`212`	`+ }`
	`213`	`+ buffer.append("\"");`
	`214`	`+ buffer.append(str.replaceAll("\\\\", "\\\\\\\\")`
	`215`	`+ .replaceAll("\r", "\\\\r")`
	`216`	`+ .replaceAll("\n", "\\\\n")`
	`217`	`+ .replaceAll("\"", "\\\\\""));`
	`218`	`+ buffer.append("\"");`
	`219`	`+ return buffer.toString();`
	`220`	`+ }`
`207`	`221`	`return null;`
`208`	`222`	`}`
`209`	`223`	`}`