Patch idle connection

bonecp-jdk-compat/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.jolbox</groupId>
         <artifactId>bonecp-parent</artifactId>
-        <version>0.8.1-SNAPSHOT</version>
+        <version>0.8.0-patchidleconnection-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

bonecp-spring/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.jolbox</groupId>
         <artifactId>bonecp-parent</artifactId>
-        <version>0.8.1-SNAPSHOT</version>
+        <version>0.8.0-patchidleconnection-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

bonecp-test-commons/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.jolbox</groupId>
         <artifactId>bonecp-parent</artifactId>
-        <version>0.8.1-SNAPSHOT</version>
+        <version>0.8.0-patchidleconnection-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

bonecp/pom.xml

@@ -19,7 +19,7 @@
     <parent> 
         <groupId>com.jolbox</groupId>
         <artifactId>bonecp-parent</artifactId>
-        <version>0.8.1-SNAPSHOT</version>
+        <version>0.8.0-patchidleconnection-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

bonecp/src/main/java/com/jolbox/bonecp/ConnectionPartition.java

@@ -91,8 +91,15 @@ protected void updateCreatedConnections(int increment) {
 
 		try{
 			this.statsLock.writeLock().lock();
-			this.createdConnections+=increment;
-	//		assert this.createdConnections >= 0 : "Created connections < 0!";
+			if (this.createdConnections == 0 && increment < 0)
+			{
+			    logger.error("The createdConnections can not be negative value");
+			}
+			else
+			{
+			    this.createdConnections+=increment;
+			}
+
 
 		} finally { 
 			this.statsLock.writeLock().unlock();

bonecp/src/main/java/com/jolbox/bonecp/ConnectionTesterThread.java

@@ -89,9 +89,15 @@ public void run() {
 						connection.setOriginatingPartition(this.partition);
 
 						// check if connection has been idle for too long (or is marked as broken)
-						if (connection.isPossiblyBroken() || 
-								((this.idleMaxAgeInMs > 0) && ( System.currentTimeMillis()-connection.getConnectionLastUsedInMs() > this.idleMaxAgeInMs))){
-							// kill off this connection - it's broken or it has been idle for too long
+						if (connection.isPossiblyBroken())
+						{
+						    // kill off this connection - it's broken, create a new one
+						    closeConnection(connection);
+						    createNew(connection);
+                            continue;
+						}
+						else if (((this.idleMaxAgeInMs > 0) && ( System.currentTimeMillis()-connection.getConnectionLastUsedInMs() > this.idleMaxAgeInMs))){
+							 // it has been idle for too long, kill it but don't recreate
 							closeConnection(connection);
 							continue;
 						}
@@ -102,6 +108,7 @@ public void run() {
 							// send a keep-alive, close off connection if we fail.
 							if (!this.pool.isConnectionHandleAlive(connection)){
 								closeConnection(connection);
+								createNew(connection);
 								continue; 
 							}
 							// calculate the next time to wake up
@@ -148,7 +155,6 @@ public void run() {
 		}
 	}
 
-
 	/** Closes off this connection
 	 * @param connection to close
 	 */
@@ -161,11 +167,13 @@ protected void closeConnection(ConnectionHandle connection) {
 				logger.error("Destroy connection exception", e);
 			} finally {
 				this.pool.postDestroyConnection(connection);
-				connection.getOriginatingPartition().getPoolWatchThreadSignalQueue().offer(new Object()); // item being pushed is not important.
 			}
 		}
 	}
-
-
+
+    private void createNew(ConnectionHandle connection)
+    {
+        connection.getOriginatingPartition().getPoolWatchThreadSignalQueue().offer(new Object());
+    }
 
 }

bonecp/src/test/java/com/jolbox/bonecp/TestConnectionThreadTester.java

@@ -383,15 +383,11 @@ public void testCloseConnection() {
 		this.testClass = new ConnectionTesterThread(mockConnectionPartition, mockExecutor, mockPool, 123, 123, false);
 		expect(mockConnection.isClosed()).andReturn(false);
 		ConnectionPartition mockPartition = EasyMock.createNiceMock(ConnectionPartition.class);
-		BlockingQueue<Object> mockQueue = EasyMock.createNiceMock(BlockingQueue.class);
-		expect(mockConnection.getOriginatingPartition()).andReturn(mockPartition);
-
-		expect(mockPartition.getPoolWatchThreadSignalQueue()).andReturn(mockQueue);
-		expect(mockQueue.offer(anyObject())).andReturn(true).anyTimes();
 		mockPool.postDestroyConnection(mockConnection);
-		replay(mockConnection, mockPool, mockQueue, mockPartition);
+		replay(mockConnection, mockPool, mockPartition);
 		this.testClass.closeConnection(mockConnection);
-		verify(mockPool, mockConnection, mockQueue);
+		verify(mockPool, mockConnection);
+
 	}
 
 
@@ -406,15 +402,11 @@ public void testCloseConnectionWithException() throws SQLException {
 		mockConnection.internalClose();
 		expectLastCall().andThrow(new SQLException());
 			ConnectionPartition mockPartition = EasyMock.createNiceMock(ConnectionPartition.class);
-		BlockingQueue<Object> mockQueue = EasyMock.createNiceMock(BlockingQueue.class);
-		expect(mockConnection.getOriginatingPartition()).andReturn(mockPartition);
 
-		expect(mockPartition.getPoolWatchThreadSignalQueue()).andReturn(mockQueue);
-		expect(mockQueue.offer(anyObject())).andReturn(true).anyTimes();
 		mockPool.postDestroyConnection(mockConnection);
-		replay(mockConnection, mockPool, mockQueue, mockPartition);
+		replay(mockConnection, mockPool, mockPartition);
 		this.testClass.closeConnection(mockConnection);
-		verify(mockPool, mockConnection, mockQueue);
+		verify(mockPool, mockConnection);
 	}
 
 	/**
@@ -429,11 +421,6 @@ public void testCloseConnectionWithExceptionInLogger() throws SQLException, NoSu
 		this.testClass = new ConnectionTesterThread(mockConnectionPartition, mockExecutor, mockPool, 123, 123, false);
 		expect(mockConnection.isClosed()).andReturn(false);
 		ConnectionPartition mockPartition = EasyMock.createNiceMock(ConnectionPartition.class);
-		BlockingQueue<Object> mockQueue = EasyMock.createNiceMock(BlockingQueue.class);
-		expect(mockConnection.getOriginatingPartition()).andReturn(mockPartition);
-
-		expect(mockPartition.getPoolWatchThreadSignalQueue()).andReturn(mockQueue);
-		expect(mockQueue.offer(anyObject())).andReturn(true).anyTimes();
 		mockPool.postDestroyConnection(mockConnection);
 		Field loggerField = this.testClass.getClass().getDeclaredField("logger");
 	    TestUtils.setFinalStatic(loggerField, null);
@@ -442,13 +429,13 @@ public void testCloseConnectionWithExceptionInLogger() throws SQLException, NoSu
 	    mockConnection.internalClose();
 	    expectLastCall().andThrow(new SQLException());
 
-		replay(mockConnection, mockPool, mockQueue, mockPartition);
+		replay(mockConnection, mockPool, mockPartition);
 		try {
 			this.testClass.closeConnection(mockConnection);
 		}catch(NullPointerException e) {
 			//normal
 		}
-		verify(mockPool, mockConnection, mockQueue);
+		verify(mockPool, mockConnection);
 
 	}
 	@Test

pom.xml

@@ -20,7 +20,7 @@
 
 	<groupId>com.jolbox</groupId>
 	<artifactId>bonecp-parent</artifactId>
-	<version>0.8.1-SNAPSHOT</version>
+	<version>0.8.0-patchidleconnection-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>BoneCP</name>