WebSVN - bacoAlunos - Path Comparison - / Rev 1118 and / Rev 1120

Ignore whitespace Rev 1118 → Rev 1120

 /impl/src/java/pt/estgp/estgweb/services/jobs/ServiceJob.java
 ,8 → 136,10
     protected abstract ILogMessages runJobServiceTask() throws Throwable;
     protected void commitPartially() {
         AbstractDao.getCurrentSession().getTransaction().commit();
         AbstractDao.getCurrentSession().beginTransaction();
-        AbstractDao.getCurrentSession().update(jobServiceTask);
+        if(jobServiceTask != null)
+            AbstractDao.getCurrentSession().update(jobServiceTask);
     }
 }

 /impl/src/java/pt/estgp/estgweb/domain/CourseUnitImpl.java
 ,7 → 97,8
             return anCourseUnit.getCode() != null && getCode() != null && getCode().equals(anCourseUnit.getCode()) &&
                    anCourseUnit.getCourseCode() != null && getCourseCode() != null && getCourseCode().equals(anCourseUnit.getCourseCode()) &&
                    anCourseUnit.getSemestre() != null && getSemestre() != null && getSemestre().equals(anCourseUnit.getSemestre()) &&
-                   anCourseUnit.getImportYear() != null && getImportYear() != null && getImportYear().equals(anCourseUnit.getImportYear());
+                   anCourseUnit.getImportYear() != null && getImportYear() != null && getImportYear().equals(anCourseUnit.getImportYear()) &&
+                   anCourseUnit.getCdTurma() != null && getCdTurma() != null && getCdTurma().equals(anCourseUnit.getCdTurma());
         }
         return false;