jlg

diff --git a/py4j-java/src/py4j/Protocol.java b/py4j-java/src/py4j/Protocol.java
index 03be9d6..2e0113a 100644
--- a/py4j-java/src/py4j/Protocol.java
+++ b/py4j-java/src/py4j/Protocol.java
@@ -164,6 +164,10 @@ public class Protocol {
                return Integer.parseInt(commandPart.substring(1, commandPart.length()));
        }

+       public final static long getLong(String commandPart) {
+               return Long.parseLong(commandPart.substring(1, commandPart.length()));

jlg

diff --git a/py4j-python/src/py4j/java_gateway.py b/py4j-python/src/py4j/java_gateway.py
index 4d47694..53addec 100644
--- a/py4j-python/src/py4j/java_gateway.py
+++ b/py4j-python/src/py4j/java_gateway.py
@@ -666,6 +666,10 @@ class CallbackServer(Thread):
         self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.lock = RLock()
         self.is_shutdown = False
+
+        logger.info('Callback Server Starting')

jlg

import java.net.ServerSocket;
import py4j.GatewayServer;

public class AddrInUseTest {

	public AddrInUseTest() {};

	public static void main(String[] args) throws Exception {
        int port = 25333;
        

jlg

import java.util.ArrayList;
import java.util.List;
import java.util.Random;

import py4j.GatewayServer;

public class OperatorExample {

    // To prevent integer overflow
    private final static int MAX = 1000;

jlg

devapp07:~/pysrc/pyapi/test/api/notifications^pytest$ py.test -n9 brokeredpermute.py
================================================================================ test session starts =================================================================================
platform linux2 -- Python 2.5.2 -- pytest-1.3.2a1
test object 1: brokeredpermute.py
[gw0] popen -- platform linux2, Python 2.5.2-final-0 cwd: /export/home/jgustak/develop/git/dev/py_srcroot/pyapi/test/api/notifications
[gw1] popen -- platform linux2, Python 2.5.2-final-0 cwd: /export/home/jgustak/develop/git/dev/py_srcroot/pyapi/test/api/notifications
[gw2] popen -- platform linux2, Python 2.5.2-final-0 cwd: /export/home/jgustak/develop/git/dev/py_srcroot/pyapi/test/api/notifications
[gw3] popen -- platform linux2, Python 2.5.2-final-0 cwd: /export/home/jgustak/develop/git/dev/py_srcroot/pyapi/test/api/notifications
[gw4] popen -- platform linux2, Python 2.5.2-final-0 cwd: /export/home/jgustak/develop/git/dev/py_srcroot/pyapi/test/api/notificatio

jlg

diff -r 6005a1fe1408 py/_plugin/pytest_resultlog.py
--- a/py/_plugin/pytest_resultlog.py    Fri Jun 25 10:30:15 2010 +0200
+++ b/py/_plugin/pytest_resultlog.py    Fri Jul 02 10:37:45 2010 +0000
@@ -16,7 +16,8 @@

 def pytest_configure(config):
     resultlog = config.option.resultlog
-    if resultlog:
+    # prevent opening resultlog on slave nodes (xdist)
+    if resultlog and not hasattr(config, 'slaveinput'):