=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/databrowser/DataBrowserTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/databrowser/DataBrowserTable.java	2009-08-24 13:55:25 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/databrowser/DataBrowserTable.java	2009-11-24 08:19:08 +0000
@@ -125,9 +125,9 @@
             ResultSetMetaData data = resultSet.getMetaData();
             if ( data.getColumnCount() == 5 )
             {
-                if ( data.getColumnLabel( 5 ).toString().equalsIgnoreCase( "ColumnHeader" ) )
+                if ( data.getColumnLabel( 5 ).equalsIgnoreCase( "ColumnHeader" ) )
                     hasColumnName = true;
-                if ( data.getColumnLabel( 4 ).toString().equalsIgnoreCase( "PeriodId" ) )
+                if ( data.getColumnLabel( 4 ).equalsIgnoreCase( "PeriodId" ) )
                     hasPeriodIds = true;
             }
         }

=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportExcelService.java'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportExcelService.java	2009-11-13 10:28:52 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportExcelService.java	2009-11-24 08:19:08 +0000
@@ -106,7 +106,7 @@
 
     public Collection<ReportExcel> getReportExcels( User user, boolean superUser, String group )
     {
-        if ( user == null || (user != null && superUser) )
+        if ( user == null || superUser )
         {
             return this.getReportsByGroup( group );
         }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java	2009-11-23 17:06:09 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java	2009-11-24 08:19:08 +0000
@@ -362,7 +362,7 @@
             reader.next();
         }
 
-        if ( reader.getXmlStreamReader().getNamespaceURI() == DXF2_NAMESPACE_URI )
+        if ( reader.getXmlStreamReader().getNamespaceURI().equals( DXF2_NAMESPACE_URI ) )
         {
             dxfVersion = 2;
             log.info( "Parsing DXF version " + dxfVersion );