Merge pull request #1668 from WildMeOrg/fix/mediaasset-safeurl-connection-leak

Close MediaAsset background/URL Shepherds in finally to stop connection leaks

Author: JasonWildMe

src/main/java/org/ecocean/media/MediaAsset.java

@@ -733,10 +733,14 @@ public URL safeURL(HttpServletRequest request) {
         Shepherd myShepherd = new Shepherd(context);
         myShepherd.setAction("MediaAsset.safeURL");
         myShepherd.beginDBTransaction();
-        URL u = safeURL(myShepherd, request);
-        myShepherd.rollbackDBTransaction();
-        myShepherd.closeDBTransaction();
-        return u;
+        // try/finally so a throw from safeURL(myShepherd, request) -- e.g. a JDO lazy-load/query
+        // failure inside bestSafeAsset() -- cannot skip the close and leak the PersistenceManager.
+        // Those leaks are the "MediaAsset.safeURL:begin" Shepherds stuck on dbconnections.jsp.
+        try {
+            return safeURL(myShepherd, request);
+        } finally {
+            myShepherd.rollbackAndClose();
+        }
     }
 
     public URL safeURL() {
@@ -1191,6 +1195,10 @@ public void run() {
                 Shepherd myShepherd = new Shepherd(context);
                 myShepherd.setAction("updateStandardChildrenBackground:" + tid);
                 myShepherd.beginDBTransaction();
+                // try/finally so a throw from load/updateStandardChildren cannot skip the close and
+                // leak this background Shepherd. commit stays inside try; the finally rollback is a
+                // harmless no-op once the commit has succeeded.
+                try {
                 int ct = 0;
                 for (Integer id : ids) {
                     ct++;
@@ -1202,7 +1210,9 @@ public void run() {
                         "] completed " + kids.size() + " children for id=" + id);
                 }
                 myShepherd.commitDBTransaction();
-                myShepherd.closeDBTransaction();
+                } finally {
+                    myShepherd.rollbackAndClose();
+                }
             }
         };
         new Thread(rn).start();

src/main/java/org/ecocean/media/YouTubeAssetStore.java

@@ -367,6 +367,10 @@ public static void backgroundGrabAndParse(final MediaAsset otherMa,
             public void run() {
                 myShepherd.setAction("YouTubeAssetStore.backgroundGrabAndParse");
                 myShepherd.beginDBTransaction();
+                // try/finally so a throw from load/save/metadata cannot skip the close and leak this
+                // background Shepherd. commit stays inside try; the finally rollback is a harmless
+                // no-op once the commit has succeeded.
+                try {
                 MediaAsset ma = MediaAssetFactory.load(otherMa.getIdInt(), myShepherd);
                 System.out.println("about to grab!");
                 boolean ok = false;
@@ -379,7 +383,9 @@ public void run() {
                     null) ? "(null metadata)" : ma.getMetadata().getDataAsString()));
                 MediaAssetFactory.save(ma, myShepherd);
                 myShepherd.commitDBTransaction();
-                myShepherd.closeDBTransaction();
+                } finally {
+                    myShepherd.rollbackAndClose();
+                }
             }
         };
         new Thread(rn).start();