Porting the memory leak fix from dev and changing version to 1.2.13 (#355)

* Fixing a minor memory leak. (#353)


# Conflicts:
#	azure-servicebus/src/main/java/com/microsoft/azure/servicebus/amqp/ConnectionHandler.java
#	pom.xml

* Cahnging version to 1.2.13

Author: yvgopal

azure-servicebus/src/main/java/com/microsoft/azure/servicebus/amqp/BaseLinkHandler.java

@@ -21,11 +21,12 @@ public BaseLinkHandler(final IAmqpLink amqpLink) {
     @Override
     public void onLinkLocalClose(Event event) {
         Link link = event.getLink();
-        if (link != null) {            
+        if (link != null) {
             TRACE_LOGGER.debug("local link close. linkName:{}", link.getName());
+            
+            checkAndFreeLink(link);
+            closeSession(link);
         }
-
-        closeSession(link);
     }
 
     @Override
@@ -40,8 +41,9 @@ public void onLinkRemoteClose(Event event) {
 
             ErrorCondition condition = link.getRemoteCondition();
             this.processOnClose(link, condition);
+            checkAndFreeLink(link);
             closeSession(link);
-        }        
+        }
     }
 
     @Override
@@ -57,7 +59,16 @@ public void onLinkRemoteDetach(Event event) {
             this.processOnClose(link, link.getRemoteCondition());
             closeSession(link);
         }
-        
+    }
+    
+    @Override
+    public void onLinkFinal(Event event)
+    {
+    	Link link = event.getLink();
+    	if(link != null)
+    	{
+    		link.attachments().clear();
+    	}
     }
 
     public void processOnClose(Link link, ErrorCondition condition) {
@@ -72,8 +83,15 @@ public void processOnClose(Link link, Exception exception) {
         this.underlyingEntity.onError(exception);
     }
 
-    private void closeSession(Link link) {
+    private static void closeSession(Link link) {
         if (link.getSession() != null && link.getSession().getLocalState() != EndpointState.CLOSED)
             link.getSession().close();
     }
+    
+    private static void checkAndFreeLink(Link link) {
+        if (link.getLocalState() == EndpointState.CLOSED && link.getRemoteState() == EndpointState.CLOSED)
+        {
+        	link.free();
+        }
+    }
 }

azure-servicebus/src/main/java/com/microsoft/azure/servicebus/amqp/ConnectionHandler.java

@@ -7,9 +7,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.net.ssl.SSLContext;
-
 import org.apache.qpid.proton.Proton;
 import org.apache.qpid.proton.amqp.Symbol;
 import org.apache.qpid.proton.amqp.transport.ErrorCondition;
@@ -179,6 +177,11 @@ public void onConnectionRemoteClose(Event event)
 	@Override
     public void onConnectionFinal(Event event) {
 	    TRACE_LOGGER.debug("onConnectionFinal: hostname:{}", event.getConnection().getHostname());
+	    Connection connection = event.getConnection();
+	    if(connection != null)
+	    {
+	    	connection.attachments().clear();
+	    }
     }
 
 	@Override

azure-servicebus/src/main/java/com/microsoft/azure/servicebus/amqp/ReactorHandler.java

@@ -21,13 +21,18 @@ public void onReactorInit(Event e)
 	{		
 		TRACE_LOGGER.debug("reactor.onReactorInit");
 
-		final Reactor reactor = e.getReactor();
+		Reactor reactor = e.getReactor();
 		reactor.setTimeout(ClientConstants.REACTOR_IO_POLL_TIMEOUT);
 	}
 
 	@Override 
 	public void onReactorFinal(Event e)
 	{		
 		TRACE_LOGGER.debug("reactor.onReactorFinal");
+		Reactor reactor = e.getReactor();
+		if(reactor != null)
+		{
+			reactor.attachments().clear();
+		}
 	}
 }

azure-servicebus/src/main/java/com/microsoft/azure/servicebus/amqp/SessionHandler.java

@@ -39,6 +39,11 @@ public void onSessionRemoteOpen(Event e)
 	public void onSessionLocalClose(Event e)
 	{		
 		TRACE_LOGGER.debug("onSessionLocalClose - entityName: {}, condition: {}", this.name, e.getSession().getCondition() == null ? "none" : e.getSession().getCondition().toString());
+		Session session = e.getSession();
+		if (session != null)
+		{
+			checkAndFreeSession(session);
+		}
 	}
 
 	@Override
@@ -47,15 +52,33 @@ public void onSessionRemoteClose(Event e)
 		TRACE_LOGGER.debug("onSessionRemoteClose - entityName: {}, condition: {}", this.name, e.getSession().getCondition() == null ? "none" : e.getSession().getCondition().toString());
 
 		Session session = e.getSession();
-		if (session != null && session.getLocalState() != EndpointState.CLOSED)
+		if (session != null)
 		{
-			session.close();
+			if(session.getLocalState() != EndpointState.CLOSED)
+			{
+				session.close();
+			}
+			
+			checkAndFreeSession(session);
 		}
 	}
 
 	@Override
 	public void onSessionFinal(Event e)
 	{ 
 	    TRACE_LOGGER.debug("onSessionFinal - entityName: {}", this.name);
+	    Session session = e.getSession();
+	    if(session != null)
+	    {
+	    	session.attachments().clear();
+	    }
+	}
+	
+	private static void checkAndFreeSession(Session session)
+	{
+		if(session.getLocalState() == EndpointState.CLOSED && session.getRemoteState() == EndpointState.CLOSED)
+		{
+			session.free();
+		}
 	}
 }

pom.xml

@@ -13,7 +13,7 @@
 		<proton-j-version>0.31.0</proton-j-version>
 	  	<junit-version>4.12</junit-version>
 		<slf4j-version>1.7.0</slf4j-version>
-		<client-current-version>1.2.12</client-current-version>		
+		<client-current-version>1.2.13</client-current-version>		
 	</properties>
 
 	<modules>