Fix crash doing release after failed terminate

Christopher Jones · Christopher Jones · commit 46a5476ae77e · 2015-02-16T08:53:32.000-08:00
diff --git a/src/dpi/src/dpiPoolImpl.cpp b/src/dpi/src/dpiPoolImpl.cpp
@@ -166,6 +166,11 @@ PoolImpl::~PoolImpl()
 
 void PoolImpl::terminate()
 {
+  if (poolName_)
+  {
+    ociCall( OCISessionPoolDestroy( spoolh_, errh_, OCI_DEFAULT), errh_);
+    poolName_ = NULL;
+  }
   env_->terminatePool(this);
 }
 
@@ -343,7 +348,8 @@ void PoolImpl::cleanup()
 {
   if (poolName_)
   {
-    ociCall( OCISessionPoolDestroy( spoolh_, errh_, OCI_DEFAULT), errh_);
+    // Ignore errors thrown.
+    OCISessionPoolDestroy( spoolh_, errh_, OCI_DEFAULT);
     poolName_ = NULL;
   }
   

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,11 @@ PoolImpl::~PoolImpl()`
`166`	`166`
`167`	`167`	`void PoolImpl::terminate()`
`168`	`168`	`{`
	`169`	`+ if (poolName_)`
	`170`	`+ {`
	`171`	`+ ociCall( OCISessionPoolDestroy( spoolh_, errh_, OCI_DEFAULT), errh_);`
	`172`	`+ poolName_ = NULL;`
	`173`	`+ }`
`169`	`174`	`env_->terminatePool(this);`
`170`	`175`	`}`
`171`	`176`
`@@ -343,7 +348,8 @@ void PoolImpl::cleanup()`
`343`	`348`	`{`
`344`	`349`	`if (poolName_)`
`345`	`350`	`{`
`346`		`- ociCall( OCISessionPoolDestroy( spoolh_, errh_, OCI_DEFAULT), errh_);`
	`351`	`+ // Ignore errors thrown.`
	`352`	`+ OCISessionPoolDestroy( spoolh_, errh_, OCI_DEFAULT);`
`347`	`353`	`poolName_ = NULL;`
`348`	`354`	`}`
`349`	`355`