NotificationsYou must be signed in to change notification settings
Fork31
Star61

Commita02d8e3

zhourenjian

committed

Fixed bug that AClass.loadClass can not accept null Runnable instance.

1 parent8769474 commita02d8e3Copy full SHA for a02d8e3

File tree

3 files changed

+14

-14

lines changed

sources/net.sf.j2s.ajax
- ajaxcore/net/sf/j2s/ajax
  - AClass.java
- ajaxrpc/net/sf/j2s/ajax
  - SimpleRPCHttpServlet.java
- ajaxswt/net/sf/j2s/ajax
  - ASWTClass.java

3 files changed

+14

-14

lines changed

`‎sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/AClass.java‎`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,35 +45,35 @@ protected AClass() {`
`45`	`45`	`*`
`46`	`46`	`* @j2sNativeSrc`
`47`	`47`	`* ClazzLoader.loadClass (clazzName, function () {`
`48`		`- * if (Clazz.instanceOf (afterLoaded, net.sf.j2s.ajax.ARunnable)) {`
	`48`	`+ * if (afterLoaded != null &&Clazz.instanceOf (afterLoaded, net.sf.j2s.ajax.ARunnable)) {`
`49`	`49`	`* var clz = Clazz.evalType (clazzName);`
`50`	`50`	`* afterLoaded.setClazz (clz);`
`51`	`51`	`* }`
`52`		`- * afterLoaded.run ();`
	`52`	`+ *if (afterLoaded != null)afterLoaded.run ();`
`53`	`53`	`* }, false, true);`
`54`	`54`	`* @j2sNative`
`55`	`55`	`* ClazzLoader.loadClass (a, function () {`
`56`		`- * if (Clazz.instanceOf (b, net.sf.j2s.ajax.ARunnable)) {`
	`56`	`+ * if (b != null &&Clazz.instanceOf (b, net.sf.j2s.ajax.ARunnable)) {`
`57`	`57`	`* var clz = Clazz.evalType (a);`
`58`	`58`	`* b.setClazz (clz);`
`59`	`59`	`* }`
`60`		`- * b.run ();`
	`60`	`+ *if (b != null)b.run ();`
`61`	`61`	`* }, false, true);`
`62`	`62`	`*/`
`63`	`63`	`publicstaticvoidload(finalStringclazzName,finalRunnableafterLoaded) {`
`64`	`64`	`newThread(newRunnable() {`
`65`	`65`	`publicvoidrun() {`
`66`	`66`	`try {`
`67`	`67`	`Classclz =Class.forName(clazzName);`
`68`		`-if (afterLoadedinstanceofARunnable) {`
	`68`	`+if (afterLoaded!=null &&afterLoadedinstanceofARunnable) {`
`69`	`69`	`ARunnablerunnable = (ARunnable)afterLoaded;`
`70`	`70`	`runnable.setClazz(clz);`
`71`	`71`	`}`
`72`	`72`	`}catch (ClassNotFoundExceptione) {`
`73`	`73`	`e.printStackTrace();`
`74`	`74`	`return ;`
`75`	`75`	`}`
`76`		`-afterLoaded.run();`
	`76`	`+if (afterLoaded !=null)afterLoaded.run();`
`77`	`77`	`}`
`78`	`78`	`}).start();`
`79`	`79`	`}`

`‎sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCHttpServlet.java‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp)`
`230`	`230`	`resp.setHeader("Pragma","no-cache");`
`231`	`231`	`resp.setHeader("Cache-Control","no-cache");`
`232`	`232`	`resp.setDateHeader("Expires",0);`
`233`		`-resp.setContentType("text/plain;charset=utf-8");`
	`233`	`+resp.setContentType("text/plain;charset=utf-8");`
`234`	`234`	`//resp.setCharacterEncoding("utf-8");`
`235`	`235`	`PrintWriterwriter =resp.getWriter();`
`236`	`236`	`runnable.deserialize(request);`

`‎sources/net.sf.j2s.ajax/ajaxswt/net/sf/j2s/ajax/ASWTClass.java‎`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,27 +83,27 @@ public static void swtLoad(String clazzName, Runnable afterLoaded) {`
`83`	`83`	`*`
`84`	`84`	`* @j2sNativeSrc`
`85`	`85`	`* ClazzLoader.loadClass (clazzName, function () {`
`86`		`- * if (Clazz.instanceOf (afterLoaded, net.sf.j2s.ajax.ARunnable)) {`
	`86`	`+ * if (afterLoaded != null &&Clazz.instanceOf (afterLoaded, net.sf.j2s.ajax.ARunnable)) {`
`87`	`87`	`* var clz = Clazz.evalType (clazzName);`
`88`	`88`	`* afterLoaded.setClazz (clz);`
`89`	`89`	`* }`
`90`		`- * afterLoaded.run ();`
	`90`	`+ *if (afterLoaded != null)afterLoaded.run ();`
`91`	`91`	`* }, false, true);`
`92`	`92`	`* @j2sNative`
`93`	`93`	`* ClazzLoader.loadClass (b, function () {`
`94`		`- * if (Clazz.instanceOf (c, net.sf.j2s.ajax.ARunnable)) {`
	`94`	`+ * if (c != null &&Clazz.instanceOf (c, net.sf.j2s.ajax.ARunnable)) {`
`95`	`95`	`* var clz = Clazz.evalType (b);`
`96`	`96`	`* c.setClazz (clz);`
`97`	`97`	`* }`
`98`		`- * c.run ();`
	`98`	`+ *if (c != null)c.run ();`
`99`	`99`	`* }, false, true);`
`100`	`100`	`*/`
`101`	`101`	`staticvoidobjectLoad(Objectdisplay,finalStringclazzName,finalRunnableafterLoaded) {`
`102`	`102`	`((Display)display).asyncExec(newRunnable() {`
`103`	`103`	`publicvoidrun() {`
`104`	`104`	`try {`
`105`		`-Classclz =Class.forName(clazzName);`
`106`		`-if (afterLoadedinstanceofARunnable) {`
	`105`	`+Classclz =Class.forName(clazzName);// May freeze UI!`
	`106`	`+if (afterLoaded!=null &&afterLoadedinstanceofARunnable) {`
`107`	`107`	`ARunnablerunnable = (ARunnable)afterLoaded;`
`108`	`108`	`runnable.setClazz(clz);`
`109`	`109`	`}`
`@@ -112,7 +112,7 @@ public void run() {`
`112`	`112`	`return ;`
`113`	`113`	`}`
`114`	`114`
`115`		`-afterLoaded.run();`
	`115`	`+if (afterLoaded !=null)afterLoaded.run();`
`116`	`116`	`}`
`117`	`117`	`});`
`118`	`118`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita02d8e3

File tree

3 files changed

3 files changed

`‎sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/AClass.java‎`

`‎sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCHttpServlet.java‎`

`‎sources/net.sf.j2s.ajax/ajaxswt/net/sf/j2s/ajax/ASWTClass.java‎`

0 commit comments