dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7473
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-07-01 18:32:04 +0200
message:
  Fixed issue with report deletion handler
modified:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/ReportDeletionHandler.java
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DefaultDeletionManager.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/ReportDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/ReportDeletionHandler.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/ReportDeletionHandler.java	2012-07-01 16:32:04 +0000
@@ -62,7 +62,7 @@
     {
         for ( Report report : reportService.getAllReports() )
         {
-            if ( report.getReportTable() != null && report.getReportTable().equals( report ) )
+            if ( report.getReportTable() != null && report.getReportTable().equals( reportTable ) )
             {
                 return report.getName();
             }

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DefaultDeletionManager.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DefaultDeletionManager.java	2012-06-30 16:01:32 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DefaultDeletionManager.java	2012-07-01 16:32:04 +0000
@@ -86,10 +86,10 @@
 
             for ( DeletionHandler handler : handlers )
             {
+                currentHandler = handler.getClass().getSimpleName();
+
                 log.debug( "Check if allowed using " + currentHandler + " for class " + className );
                 
-                currentHandler = handler.getClass().getSimpleName();
-
                 Object allow = allowMethod.invoke( handler, object );
 
                 if ( allow != null )