/hg/release/icedtea6-1.7: - Set timeout to 120 seconds (previous...

[dbhole at icedtea.classpath.org]

changeset fe894254bf91 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=fe894254bf91
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Jul 13 14:48:45 2010 -0400

	- Set timeout to 120 seconds (previous commit mistakenly changed it
	to 10).
	- Print debug info only in debug mode.


diffstat:

3 files changed, 16 insertions(+), 3 deletions(-)
ChangeLog                                      |    7 +++++++
plugin/icedteanp/IcedTeaJavaRequestProcessor.h |    2 +-
plugin/icedteanp/IcedTeaPluginUtils.h          |   10 ++++++++--

diffs (46 lines):

diff -r cb75225afcd4 -r fe894254bf91 ChangeLog
--- a/ChangeLog	Mon Jul 12 18:41:55 2010 -0400
+++ b/ChangeLog	Tue Jul 13 14:48:45 2010 -0400
@@ -1,3 +1,10 @@ 2010-06-14  Deepak Bhole <dbhole at redhat.
+2010-07-13  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Set timeout to 120
+	seconds (previous commit mistakenly changed it to 10).
+	* plugin/icedteanp/IcedTeaPluginUtils.h: Print debug info only in debug
+	mode.
+
 2010-06-14  Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/icedteanp/IcedTeaJavaRequestProcessor.cc: Use variadic macro
diff -r cb75225afcd4 -r fe894254bf91 plugin/icedteanp/IcedTeaJavaRequestProcessor.h
--- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.h	Mon Jul 12 18:41:55 2010 -0400
+++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.h	Tue Jul 13 14:48:45 2010 -0400
@@ -46,7 +46,7 @@ exception statement from your version. *
 #include "IcedTeaNPPlugin.h"
 #include "IcedTeaPluginUtils.h"
 
-#define REQUESTTIMEOUT 10
+#define REQUESTTIMEOUT 120
 
 /*
  * This struct holds data specific to a Java operation requested by the plugin
diff -r cb75225afcd4 -r fe894254bf91 plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.h	Mon Jul 12 18:41:55 2010 -0400
+++ b/plugin/icedteanp/IcedTeaPluginUtils.h	Tue Jul 13 14:48:45 2010 -0400
@@ -67,8 +67,14 @@ exception statement from your version. *
 #include "IcedTeaNPPlugin.h"
 
 #define PLUGIN_DEBUG(...) \
-	fprintf (stderr, "ITNPP Thread# %d: ", pthread_self()); \
-	fprintf (stderr, __VA_ARGS__)
+  do                                                          \
+  {                                                           \
+    if (plugin_debug)                                         \
+    {                                                         \
+      fprintf (stderr, "ITNPP Thread# %ld: ", pthread_self()); \
+      fprintf (stderr, __VA_ARGS__);                          \
+    }                                                         \
+  } while (0)
 
 #define CHECK_JAVA_RESULT(result_data)                               \
 {                                                                    \