t push

MitchellKato · MitchellKato · commit e67cdfc82889 · 2020-08-27T16:50:08.000+01:00
Merge branch 'release' of git.sami.int.thomsonreuters.com:EPD/esdk into release
diff --git a/Java/Eta/ValueAdd/src/main/java/com/thomsonreuters/upa/valueadd/reactor/Reactor.java b/Java/Eta/ValueAdd/src/main/java/com/thomsonreuters/upa/valueadd/reactor/Reactor.java
@@ -1113,13 +1113,21 @@ int sessionManagementStartup(ReactorTokenSession tokenSession, ReactorConnectInf
 				return errorInfo.code();
 			}
     	
-            if (isBlocking && reactorChannel.applyServiceDiscoveryEndpoint(errorInfo) != ReactorReturnCodes.SUCCESS)
+            if ( isBlocking )
             {
-            	return errorInfo.code();
+            	if(reactorChannel.applyServiceDiscoveryEndpoint(errorInfo) != ReactorReturnCodes.SUCCESS)
+            	{
+            		return errorInfo.code();
+            	}
+            	else
+            	{
+            		reactorChannel.state(State.EDP_RT_DONE);
+            	}
             }
             else
             {
-            	reactorChannel.state(State.EDP_RT_DONE);
+            	/* Waits for a service discovery response for non-blocking request. */
+            	reactorChannel.state(State.EDP_RT);
             }
     	}
     	else
diff --git a/Java/Eta/ValueAdd/src/main/java/com/thomsonreuters/upa/valueadd/reactor/ReactorOAuthCredential.java b/Java/Eta/ValueAdd/src/main/java/com/thomsonreuters/upa/valueadd/reactor/ReactorOAuthCredential.java
@@ -179,7 +179,7 @@ public void takeExclusiveSignOnControl(boolean takeExclusiveSignOnControl)
      * 
      * <p>The Reactor will not copy password and client secret if the callback is specified.</p>
      * 
-     * @param oAuthCredentialEventCallback
+     * @param oAuthCredentialEventCallback the OAuth credential event callback.
      */
     public void reactorOAuthCredentialEventCallback(ReactorOAuthCredentialEventCallback oAuthCredentialEventCallback)
     {

Original file line number	Diff line number	Diff line change
`@@ -1113,13 +1113,21 @@ int sessionManagementStartup(ReactorTokenSession tokenSession, ReactorConnectInf`
`1113`	`1113`	`return errorInfo.code();`
`1114`	`1114`	`}`
`1115`	`1115`
`1116`		`- if (isBlocking && reactorChannel.applyServiceDiscoveryEndpoint(errorInfo) != ReactorReturnCodes.SUCCESS)`
	`1116`	`+ if ( isBlocking )`
`1117`	`1117`	`{`
`1118`		`- return errorInfo.code();`
	`1118`	`+ if(reactorChannel.applyServiceDiscoveryEndpoint(errorInfo) != ReactorReturnCodes.SUCCESS)`
	`1119`	`+ {`
	`1120`	`+ return errorInfo.code();`
	`1121`	`+ }`
	`1122`	`+ else`
	`1123`	`+ {`
	`1124`	`+ reactorChannel.state(State.EDP_RT_DONE);`
	`1125`	`+ }`
`1119`	`1126`	`}`
`1120`	`1127`	`else`
`1121`	`1128`	`{`
`1122`		`- reactorChannel.state(State.EDP_RT_DONE);`
	`1129`	`+ /* Waits for a service discovery response for non-blocking request. */`
	`1130`	`+ reactorChannel.state(State.EDP_RT);`
`1123`	`1131`	`}`
`1124`	`1132`	`}`
`1125`	`1133`	`else`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public void takeExclusiveSignOnControl(boolean takeExclusiveSignOnControl)`
`179`	`179`	`*`
`180`	`180`	`* <p>The Reactor will not copy password and client secret if the callback is specified.</p>`
`181`	`181`	`*`
`182`		`- * @param oAuthCredentialEventCallback`
	`182`	`+ * @param oAuthCredentialEventCallback the OAuth credential event callback.`
`183`	`183`	`*/`
`184`	`184`	`public void reactorOAuthCredentialEventCallback(ReactorOAuthCredentialEventCallback oAuthCredentialEventCallback)`
`185`	`185`	`{`