[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[higgins-dev] proposed fix to jndi cp 1.0 branch

Brian,


We're using Higgins 1.0 for a project and would like to push https://bugs.eclipse.org/bugs/show_bug.cgi?id=232234 into that branch.  It doesn't *exactly* meet the patch criteria at http://wiki.eclipse.org/Higgins_Committers_and_Contributors#Higgins_Bug-Fix_Release_Criteria unless we say it's causing a major feature to not work as expected.


But, it's a fairly safe fix from what I can tell.  I've attached the diff.


Jim

Index: /home/jimse/dev/bandit/org.eclipse.higgins.idas.cp.jndi/src/org/eclipse/higgins/idas/cp/jndi/JNDIContext.java
===================================================================
--- /home/jimse/dev/bandit/org.eclipse.higgins.idas.cp.jndi/src/org/eclipse/higgins/idas/cp/jndi/JNDIContext.java	(revision 16423)
+++ /home/jimse/dev/bandit/org.eclipse.higgins.idas.cp.jndi/src/org/eclipse/higgins/idas/cp/jndi/JNDIContext.java	(working copy)
@@ -604,7 +604,7 @@
 			}
 			catch (NamingException e)
 			{
-				throw new IdASException(e);
+				_handleNamingException(e);
 			}
 		}
 		if (iLoop == addressList.size())
@@ -622,7 +622,10 @@
 				_tls.close();
 				_bStartTLS = false;
 			}
-			_ctx.close();
+			if (_ctx != null)
+			{
+				_ctx.close();
+			}
 		}
 		catch (NamingException e)
 		{