[Red5commits] [red5 commit] r3580 - Applied patch for APPSERVER-364

[codesite-noreply at google.com]

Author: mondain
Date: Mon Apr  6 12:31:10 2009
New Revision: 3580

Modified:
    doc/trunk/changelog.txt
    java/server/trunk/src/org/red5/server/persistence/FilePersistence.java

Log:
Applied patch for APPSERVER-364

Modified: doc/trunk/changelog.txt
==============================================================================
--- doc/trunk/changelog.txt	(original)
+++ doc/trunk/changelog.txt	Mon Apr  6 12:31:10 2009
@@ -29,6 +29,7 @@
  - Created means for segregated Quartz schedulers per application. The bug  
was
    that the main scheduler has no idea where to location classes you try
    to access in your scheduled job (No jira)
+- Issue when reading empty persistent shared objects (APPSERVER-364)

  ---------------------------
  Red5 0.8.0 RC2

Modified:  
java/server/trunk/src/org/red5/server/persistence/FilePersistence.java
==============================================================================
--- java/server/trunk/src/org/red5/server/persistence/FilePersistence.java	 
(original)
+++ java/server/trunk/src/org/red5/server/persistence/FilePersistence.java	 
Mon Apr  6 12:31:10 2009
@@ -34,6 +34,7 @@
  import org.red5.server.api.IScope;
  import org.red5.server.api.persistence.IPersistable;
  import org.red5.server.net.servlet.ServletUtils;
+import org.red5.server.so.SharedObject;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  import org.springframework.core.io.Resource;
@@ -402,6 +403,16 @@

          //if we made it this far and everything seems ok
          if (result) {
+//        	Here we go. If it's a persistent SharedObject and it's empty,
+//        	don't write it to disk. APPSERVER-364
+        	if (object instanceof SharedObject) {
+        		SharedObject soRef = (SharedObject)object;
+        		if (soRef.getAttributes().size() == 0) {
+//        			Just return true to trick the server into thinking everything  
is just fine :P
+        			return true;
+        		}
+        	}
+        	
      		String filename = getObjectFilename(object);
      		log.debug("File name: {}", filename);
      		//strip path