[FAB-16091] Handle invalid contract name

Change-Id: I4897e11686199edf4db7df974a59f2dcd20af132
Signed-off-by: James Taylor <[email protected]>

Author: jt-nti

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/routing/impl/RoutingRegistryImpl.java

@@ -18,6 +18,7 @@
 
 import org.hyperledger.fabric.Logger;
 import org.hyperledger.fabric.contract.ContractInterface;
+import org.hyperledger.fabric.contract.ContractRuntimeException;
 import org.hyperledger.fabric.contract.annotation.Contract;
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Transaction;
@@ -113,7 +114,13 @@ public TxFunction getTxFn(InvocationRequest request) {
      */
     @Override
     public ContractDefinition getContract(String namespace) {
-        return contracts.get(namespace);
+        ContractDefinition contract = contracts.get(namespace);
+
+        if (contract == null) {
+            throw new ContractRuntimeException("Undefined contract called");
+        }
+
+        return contract;
     }
 
     /*

fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/contract/ContractRouterTest.java

@@ -156,6 +156,33 @@ public void testInvokeTxnWithDefinedNameUsingMethodName() {
         assertThat(SampleContract.t1Invoked, is(0));
     }
 
+    @Test
+    public void testInvokeContractThatDoesNotExist() {
+        ContractRouter r = new ContractRouter(new String[] { "-a", "127.0.0.1:7052", "-i", "testId" });
+        r.findAllContracts();
+        ChaincodeStub s = new ChaincodeStubNaiveImpl();
+
+        List<String> args = new ArrayList<>();
+        args.add("thereisnocontract:t1");
+        args.add("asdf");
+        ((ChaincodeStubNaiveImpl) s).setStringArgs(args);
+
+        SampleContract.beforeInvoked = 0;
+        SampleContract.afterInvoked = 0;
+        SampleContract.doWorkInvoked = 0;
+        SampleContract.t1Invoked = 0;
+
+        Chaincode.Response response = r.invoke(s);
+        assertThat(response, is(notNullValue()));
+        assertThat(response.getStatus(), is(Chaincode.Response.Status.INTERNAL_SERVER_ERROR));
+        assertThat(response.getMessage(), is(equalTo("Undefined contract called")));
+        assertThat(response.getStringPayload(), is(nullValue()));
+        assertThat(SampleContract.beforeInvoked, is(0));
+        assertThat(SampleContract.afterInvoked, is(0));
+        assertThat(SampleContract.doWorkInvoked, is(0));
+        assertThat(SampleContract.t1Invoked, is(0));
+    }
+
     @Test
     public void testInvokeTxnThatDoesNotExist() {
         ContractRouter r = new ContractRouter(new String[] { "-a", "127.0.0.1:7052", "-i", "testId" });