Index: server/pifr_server.xmlrpc.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_review/server/pifr_server.xmlrpc.inc,v
retrieving revision 1.40
diff -u -r1.40 pifr_server.xmlrpc.inc
--- server/pifr_server.xmlrpc.inc	26 Jan 2010 05:40:05 -0000	1.40
+++ server/pifr_server.xmlrpc.inc	9 Feb 2010 20:55:58 -0000
@@ -350,14 +350,21 @@
     pifr_debug('XML-RPC result(): valid test client.');
 
     // Ensure that test was sent to the client returning the result.
-    $test = pifr_server_test_get($result['test_id']);
-    if ($test['status'] == PIFR_SERVER_TEST_STATUS_QUEUED && !pifr_server_environment_status_get_client($test, $client)) {
-      watchdog('pifr_server', 'Test not assigned to client: (t: @test_id, c: @client_id)',
-               array('@test_id' => $test['test_id'], '@client_id' => $client['client_id']), WATCHDOG_ALERT);
+    if ($test = pifr_server_test_get($result['test_id'])) {
+      if (pifr_server_environment_status_get_client($test, $client)) {
+        pifr_server_test_result($test, $result, $client);
+      }
+      else {
+        watchdog('pifr_server', 'Test not assigned to client: (t: @test_id, c: @client_id)',
+             array('@test_id' => $test['test_id'], '@client_id' => $client['client_id']), WATCHDOG_ALERT);
+        return PIFR_RESPONSE_DENIED;
+      }
+    }
+    else {
+      watchdog('pifr_server', 'Invalid test ID: (t: @test_id, c: @client_id)',
+             array('@test_id' => $test['test_id'], '@client_id' => $client['client_id']), WATCHDOG_ALERT);
       return PIFR_RESPONSE_DENIED;
     }
-
-    pifr_server_test_result($test, $result, $client);
   }
   else {
     pifr_debug('XML-RPC result(): invalid test client.');