[Pydev-cvs] org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole PydevConsoleCommunication.java, 1.11, 1.12 PydevConsoleConstants.java, 1.7, 1.8

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19217/src_console/org/python/pydev/debug/newconsole

Modified Files:
	PydevConsoleCommunication.java PydevConsoleConstants.java 
Log Message:
Minor changes for console / possible race condition on linking with outline page.

Index: PydevConsoleConstants.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole/PydevConsoleConstants.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PydevConsoleConstants.java	15 Jun 2008 19:01:31 -0000	1.7
--- PydevConsoleConstants.java	21 Aug 2008 20:56:34 -0000	1.8
***************
*** 44,48 ****
      
      public static final String INTERACTIVE_CONSOLE_MAXIMUM_CONNECTION_ATTEMPTS = "INTERACTIVE_CONSOLE_MAXIMUM_CONNECTION_ATTEMPTS";
!     public static final int DEFAULT_INTERACTIVE_CONSOLE_MAXIMUM_CONNECTION_ATTEMPTS = 20;
  
  }
--- 44,48 ----
      
      public static final String INTERACTIVE_CONSOLE_MAXIMUM_CONNECTION_ATTEMPTS = "INTERACTIVE_CONSOLE_MAXIMUM_CONNECTION_ATTEMPTS";
!     public static final int DEFAULT_INTERACTIVE_CONSOLE_MAXIMUM_CONNECTION_ATTEMPTS = 50;
  
  }

Index: PydevConsoleCommunication.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole/PydevConsoleCommunication.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PydevConsoleCommunication.java	13 Aug 2008 21:12:25 -0000	1.11
--- PydevConsoleCommunication.java	21 Aug 2008 20:56:33 -0000	1.12
***************
*** 251,257 ****
                              
                              //executed.o1 is not null only if we had an error
!                             if(executed.o1 != null && (
!                             	executed.o1.indexOf("Connection refused: connect") != -1 ||
!                             	executed.o1.indexOf("Failed to read servers response: Connection refused") != -1)){
                                  if(firstCommWorked){
                                      break;
--- 251,255 ----
                              
                              //executed.o1 is not null only if we had an error
!                             if(executed.o1 != null && executed.o1.indexOf("refused") != -1){
                                  if(firstCommWorked){
                                      break;