spacemanager: unknown message have to be sent to Poolmanager

as SpaceManager works as a proxy, not all messages handled as
expected.

Ticket: 7844
Acked-by: Gerd Behrmann
Target: trunk, 2.6
Require-book: no
Require-notes: yes
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>

Author: kofemann

modules/dcache/src/main/java/diskCacheV111/services/space/Manager.java

@@ -3506,21 +3506,31 @@ private void handleMessageAsDisabled(CellMessage cellMessage)
 
             Message message = (Message) cellMessage.getMessageObject();
 
-            if (message instanceof PoolMgrSelectPoolMsg) {
-
-                forwardToPoolmanager(cellMessage);
-
-            } else if (message instanceof PoolFileFlushedMessage ||
+            if (message instanceof PoolFileFlushedMessage ||
                     message instanceof PoolRemoveFilesMessage ||
                     message instanceof PnfsDeleteEntryNotificationMessage) {
 
                 // Simply ignore these notification messages
 
-            } else if (message.getReplyRequired()) {
+            } else if (message instanceof Reserve
+                    || message instanceof GetSpaceTokensMessage
+                    || message instanceof GetSpaceTokenIdsMessage
+                    || message instanceof GetLinkGroupsMessage
+                    || message instanceof GetLinkGroupNamesMessage
+                    || message instanceof GetLinkGroupIdsMessage
+                    || message instanceof Release
+                    || message instanceof Use
+                    || message instanceof CancelUse
+                    || message instanceof GetSpaceMetaData
+                    || message instanceof GetSpaceTokens
+                    || message instanceof ExtendLifetime
+                    || message instanceof GetFileSpaceTokensMessage ) {
 
                 returnFailedResponse("SpaceManager is disabled in configuration",
                         message, cellMessage);
 
+            } else {
+                forwardToPoolmanager(cellMessage);
             }
         }
 
@@ -3618,12 +3628,10 @@ else if (spaceMessage instanceof PnfsDeleteEntryNotificationMessage) {
                                 markFileDeleted(msg);
                         }
                         else {
-                                logger.error("unknown message, type {} " +
-                                        "value {}",
-                                        spaceMessage.getClass().getName(),
-                                        spaceMessage);
-                                super.messageArrived(cellMessage);
-                                return;
+                            if (!spaceMessage.isReply()) {
+                                forwardToPoolmanager(cellMessage);
+                            }
+                            return;
                         }
                 }
                 catch(SpaceException se) {