Merge pull request #36 from epics-base/Issue_34

shroffk · web-flow · commit c53095990728 · 2018-10-22T10:59:48.000-04:00
#34 fixing the timeLeft to consistently be secs
diff --git a/pvAccessJava/src/org/epics/pvaccess/client/rpc/RPCClientImpl.java b/pvAccessJava/src/org/epics/pvaccess/client/rpc/RPCClientImpl.java
@@ -122,7 +122,7 @@ public PVStructure request(PVStructure pvArgument, double timeout)
 		
 		synchronized (resultMonitor) {
 			sendRequestInternal(timeout, pvArgument);
-			long timeLeft = Math.max(timeoutMs - (System.currentTimeMillis() - startTime), 0);
+			long timeLeft = Math.max((timeoutMs - (System.currentTimeMillis() - startTime))/1000, 0);
 			if (waitResponse(timeLeft))
 			{
 				if (status.isSuccess())

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public PVStructure request(PVStructure pvArgument, double timeout)`
`122`	`122`
`123`	`123`	`synchronized (resultMonitor) {`
`124`	`124`	`sendRequestInternal(timeout, pvArgument);`
`125`		`- long timeLeft = Math.max(timeoutMs - (System.currentTimeMillis() - startTime), 0);`
	`125`	`+ long timeLeft = Math.max((timeoutMs - (System.currentTimeMillis() - startTime))/1000, 0);`
`126`	`126`	`if (waitResponse(timeLeft))`
`127`	`127`	`{`
`128`	`128`	`if (status.isSuccess())`