[dcm4che-commits] CVS: dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp StoreScpService.java,1.25,1.26 StoreScp.java,1.30,1.31

[Franz W. <jav...@us...>]

Update of /cvsroot/dcm4che/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19010/src/java/org/dcm4chex/archive/dcm/storescp

Modified Files:
	StoreScpService.java StoreScp.java 
Log Message:
FreeDiskSpace: autoPurge after freeDiskSpace; freeDiskSpace on demand.

Index: StoreScpService.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp/StoreScpService.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** StoreScpService.java	8 Jun 2005 18:08:31 -0000	1.25
--- StoreScpService.java	4 Jul 2005 09:21:07 -0000	1.26
***************
*** 397,401 ****
                      null);
          } catch (JMException e) {
!             throw new RuntimeException("Failed to invoke isLocalFileSystem", e);
          }
      }
--- 397,401 ----
                      null);
          } catch (JMException e) {
!             throw new RuntimeException("Failed to invoke selectStorageFileSystem", e);
          }
      }
***************
*** 425,427 ****
--- 425,449 ----
          }
      }
+     
+ 	boolean isFreeDiskSpaceOnDemand() {
+         try {
+             Boolean b = (Boolean) server.getAttribute(fileSystemMgtName,
+                     "FreeDiskSpaceOnDemand");
+             return b.booleanValue();
+         } catch (JMException e) {
+             throw new RuntimeException("Failed to invoke getAttribute 'FreeDiskSpaceOnDemand'", e);
+         }
+ 	}
+ 	
+ 	void callFreeDiskSpace() {
+         try {
+             server.invoke(fileSystemMgtName,
+                     "freeDiskSpace",
+                     null,
+                     null);
+         } catch (JMException e) {
+             throw new RuntimeException("Failed to invoke freeDiskSpace", e);
+         }
+ 		
+ 	}
  }
\ No newline at end of file

Index: StoreScp.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp/StoreScp.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** StoreScp.java	22 Jun 2005 22:18:30 -0000	1.30
--- StoreScp.java	4 Jul 2005 09:21:07 -0000	1.31
***************
*** 590,593 ****
--- 590,596 ----
          logInstancesStored(assoc);
          service.sendReleaseNotification(assoc);
+         if ( service.isFreeDiskSpaceOnDemand() ) {
+         	service.callFreeDiskSpace();
+         }
      }