View | Details | Raw Unified | Return to bug 48350
Collapse All | Expand All

(-)ClientJMeterEngine.java (-1 / +6 lines)
Lines 44-49 Link Here
44
    private HashTree test;
44
    private HashTree test;
45
45
46
    private final String host;
46
    private final String host;
47
    
48
    private static final Byte LOCK = new Byte((byte) 0);
47
49
48
    private static RemoteJMeterEngine getEngine(String h) throws MalformedURLException, RemoteException,
50
    private static RemoteJMeterEngine getEngine(String h) throws MalformedURLException, RemoteException,
49
            NotBoundException {
51
            NotBoundException {
Lines 119-125 Link Here
119
121
120
        try {
122
        try {
121
            JMeterContextService.startTest();
123
            JMeterContextService.startTest();
122
            remote.configure(test, host);
124
            synchronized (LOCK) {
125
            	// Workaround to avoid deadlock
126
                remote.configure(test, host);				
127
			}
123
            log.info("sent test to " + host);
128
            log.info("sent test to " + host);
124
            if (savep != null){
129
            if (savep != null){
125
                log.info("Sending properties "+savep);
130
                log.info("Sending properties "+savep);

Return to bug 48350