Merge pull request #6759 from aspnet/pakrym/merge22

Merge 2.2 into master

Author: pakrym

eng/PatchConfig.props

@@ -20,8 +20,11 @@ Later on, this will be checked using this condition:
   <PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.2' ">
     <PackagesInPatch>
       @aspnet/signalr;
+      Microsoft.AspNetCore.AspNetCoreModuleV2;
       Microsoft.AspNetCore.Authentication.Google;
       Microsoft.AspNetCore.Http;
+      Microsoft.AspNetCore.Server.IIS;
+      java:signalr;
     </PackagesInPatch>
   </PropertyGroup>
 

src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java

@@ -465,7 +465,7 @@ private void stopConnection(String errorMessage) {
      */
     public void send(String method, Object... args) {
         if (hubConnectionState != HubConnectionState.CONNECTED) {
-            throw new RuntimeException("The 'send' method cannot be called if the connection is not active");
+            throw new RuntimeException("The 'send' method cannot be called if the connection is not active.");
         }
 
         InvocationMessage invocationMessage = new InvocationMessage(null, method, args);
@@ -483,6 +483,10 @@ public void send(String method, Object... args) {
      */
     @SuppressWarnings("unchecked")
     public <T> Single<T> invoke(Class<T> returnType, String method, Object... args) {
+        if (hubConnectionState != HubConnectionState.CONNECTED) {
+            throw new RuntimeException("The 'invoke' method cannot be called if the connection is not active.");
+        }
+
         String id = connectionState.getNextInvocationId();
         InvocationMessage invocationMessage = new InvocationMessage(id, method, args);
 

src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubConnectionTest.java

@@ -1119,7 +1119,16 @@ public void cannotSendBeforeStart()  {
         assertEquals(HubConnectionState.DISCONNECTED, hubConnection.getConnectionState());
 
         Throwable exception = assertThrows(RuntimeException.class, () -> hubConnection.send("inc"));
-        assertEquals("The 'send' method cannot be called if the connection is not active", exception.getMessage());
+        assertEquals("The 'send' method cannot be called if the connection is not active.", exception.getMessage());
+    }
+
+    @Test
+    public void cannotInvokeBeforeStart()  {
+        HubConnection hubConnection = TestUtils.createHubConnection("http://example.com");
+        assertEquals(HubConnectionState.DISCONNECTED, hubConnection.getConnectionState());
+
+        Throwable exception = assertThrows(RuntimeException.class, () -> hubConnection.invoke(String.class, "inc", "arg1"));
+        assertEquals("The 'invoke' method cannot be called if the connection is not active.", exception.getMessage());
     }
 
     @Test
@@ -1423,4 +1432,4 @@ public void non200FromNegotiateThrowsError() {
             () -> hubConnection.start().timeout(1, TimeUnit.SECONDS).blockingAwait());
         assertEquals("Unexpected status code returned from negotiate: 500 Internal server error.", exception.getMessage());
     }
-}
+}