From 723e056c48262d30db93cb116a89b01dc11d701a Mon Sep 17 00:00:00 2001
From: theli <theli@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Fri, 28 Oct 2005 07:25:22 +0000
Subject: [PATCH] *) Bugfix for ClassCastException during SessionPool.close

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@996 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 source/de/anomic/server/serverCore.java | 26 +++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/source/de/anomic/server/serverCore.java b/source/de/anomic/server/serverCore.java
index abf1d640a..0e995cd06 100644
--- a/source/de/anomic/server/serverCore.java
+++ b/source/de/anomic/server/serverCore.java
@@ -520,7 +520,12 @@ public final class serverCore extends serverAbstractThread implements serverThre
          * @see org.apache.commons.pool.impl.GenericObjectPool#returnObject(java.lang.Object)
          */
         public void returnObject(Object obj) throws Exception  {
-            super.returnObject(obj);
+            if (obj instanceof Session) {
+                super.returnObject(obj);
+            } else {
+                serverLog.logSevere("SESSION-POOL","Object of wront type '" + obj.getClass().getName() +
+                                    "'returned to pool.");
+            }
         }        
         
         public synchronized void close() throws Exception {
@@ -541,7 +546,9 @@ public final class serverCore extends serverAbstractThread implements serverThre
                 for ( int currentThreadIdx = 0; currentThreadIdx < threadCount; currentThreadIdx++ )  {
                     Thread currentThread = threadList[currentThreadIdx];
                     if (currentThread.isAlive()) {
-                        ((Session)currentThread).setStopped(true);
+                        if (currentThread instanceof Session) {
+                            ((Session)currentThread).setStopped(true);
+                        }
                     }
                 }          
 
@@ -557,8 +564,10 @@ public final class serverCore extends serverAbstractThread implements serverThre
                 for ( int currentThreadIdx = 0; currentThreadIdx < threadCount; currentThreadIdx++ )  {
                     Thread currentThread = threadList[currentThreadIdx];
                     if (currentThread.isAlive()) {
-                        serverCore.this.log.logInfo("Trying to shutdown session thread '" + currentThread.getName() + "' [" + currentThreadIdx + "].");
-                        ((Session)currentThread).close();
+                        if (currentThread instanceof Session) {
+                            serverCore.this.log.logInfo("Trying to shutdown session thread '" + currentThread.getName() + "' [" + currentThreadIdx + "].");
+                            ((Session)currentThread).close();
+                        }
                     }
                 }                
                 
@@ -567,8 +576,10 @@ public final class serverCore extends serverAbstractThread implements serverThre
                 for ( int currentThreadIdx = 0; currentThreadIdx < threadCount; currentThreadIdx++ )  {
                     Thread currentThread = threadList[currentThreadIdx];
                     if (currentThread.isAlive()) {
-                        serverCore.this.log.logFine("Waiting for session thread '" + currentThread.getName() + "' [" + currentThreadIdx + "] to finish shutdown.");
-                        try { currentThread.join(500); } catch (InterruptedException ex) {}
+                        if (currentThread instanceof Session) {
+                            serverCore.this.log.logFine("Waiting for session thread '" + currentThread.getName() + "' [" + currentThreadIdx + "] to finish shutdown.");
+                            try { currentThread.join(500); } catch (InterruptedException ex) {}
+                        }
                     }
                 }
                 
@@ -616,8 +627,7 @@ public final class serverCore extends serverAbstractThread implements serverThre
          * @see org.apache.commons.pool.PoolableObjectFactory#validateObject(java.lang.Object)
          */
         public boolean validateObject(Object obj) {
-            if (obj instanceof Session) 
-            {
+            if (obj instanceof Session) {
                 Session theSession = (Session) obj;
                 if (!theSession.isAlive() || theSession.isInterrupted()) return false;
                 if (theSession.isRunning()) return true;