getDataFromCDB() now successfully creates a CDB object in the Registry

- Calls getData with the PDB age limit on the CDB object
- Verifies that the CDB objects name matches the databasename from the
PDB object

@@ -248,6 +248,7 @@ public class OraMon {
 			return false;
 			return false;
 		}
 		}
 		// We do have the lock. Do the rest in a try catch everything and if we catch anything, re throw the catch but always release the lock.
 		// We do have the lock. Do the rest in a try catch everything and if we catch anything, re throw the catch but always release the lock.
+		Statement stmt = null;
 		try {
 		try {
 	 		long startTSns = System.nanoTime();
 	 		long startTSns = System.nanoTime();
 	 		getDataCalls++;
 	 		getDataCalls++;
@@ -264,7 +265,7 @@ public class OraMon {
 	 		if(stale) {
 	 		if(stale) {
 	 			open();
 	 			open();
 	 		}
 	 		}
-			Statement stmt = conn.createStatement();
+			stmt = conn.createStatement();
 			ResultSet rset = null;
 			ResultSet rset = null;
 			
 			
 			//Get the database name once // Currently always gets the CDB name
 			//Get the database name once // Currently always gets the CDB name
@@ -304,7 +305,7 @@ public class OraMon {
 			// If we have containers, but we are not the CDB, then we are a PDB. 
 			// If we have containers, but we are not the CDB, then we are a PDB. 
 			// We should ask the CDB object for our data
 			// We should ask the CDB object for our data
 			if(isPDB) {
 			if(isPDB) {
-				getDataFromCDB();
+				getDataFromCDB(ageTs);
 			} else {
 			} else {
 				// All other cases (CDB or an instance without containers) get the data from the database
 				// All other cases (CDB or an instance without containers) get the data from the database
 				
 				
@@ -340,6 +341,13 @@ public class OraMon {
 			Throwable thisCause = e;
 			Throwable thisCause = e;
 			while(lastCause != null) { thisCause = lastCause; lastCause = thisCause.getCause(); }
 			while(lastCause != null) { thisCause = lastCause; lastCause = thisCause.getCause(); }
 			lastEx = thisCause;
 			lastEx = thisCause;
+			// Close the connection and statement to prevent memory leaks
+			try {
+				stmt.close();
+				conn.close();
+			} catch (Exception e2) {
+				// Dont care
+			}
 			throw (e);
 			throw (e);
 		} finally {
 		} finally {
 			lock.unlock();
 			lock.unlock();
@@ -347,10 +355,19 @@ public class OraMon {
 		// End thread safe
 		// End thread safe
 	}
 	}
  	
  	
- 	public void getDataFromCDB() {
+ 	public void getDataFromCDB(long ageTs) throws Throwable {
  		//Generate a con string for the CDB using the PDB con string and replace the service name
  		//Generate a con string for the CDB using the PDB con string and replace the service name
  		String cdbConString = getConString().replaceAll(getServiceName(), getDBName());
  		String cdbConString = getConString().replaceAll(getServiceName(), getDBName());
  		System.out.println("CDB seems to be: " + cdbConString);
  		System.out.println("CDB seems to be: " + cdbConString);
+ 		//Find the CDB in the registry
+ 		OraMon myCDB = Registry.findOrCreate(cdbConString, conUser, conPass);
+ 		myCDB.getData(ageTs);
+ 		// Verify the CDB
+ 		if (getDBName().equals(myCDB.getDBName())) {
+ 			System.out.println("myCDB name equals DBName");
+ 		} else {
+ 			System.out.println("myCDB name does not equal DBName");
+ 		}
  	}
  	}
  	
  	
 	public Throwable getLastEx() {
 	public Throwable getLastEx() {