db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r816927 - in /db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc: company/ companyAnnotatedFC/ companyAnnotatedJPA/ companyAnnotatedPC/ companyListWithoutJoin/ companyMapWithoutJoin/ order/
Date Sat, 19 Sep 2009 14:03:10 GMT
Author: mbo
Date: Sat Sep 19 14:03:09 2009
New Revision: 816927

URL: http://svn.apache.org/viewvc?rev=816927&view=rev
Log:
JDO-640: NPE when running tck in debug mode
Fixed debug statement in the company factory methods. 
Now the all fields are initialized before the instance is printed. 
Changed print code to check or date fields being null.

Modified:
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/Company.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/Employee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/Person.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Company.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Person.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/order/OrderFactoryAbstractImpl.java

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/Company.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/Company.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/Company.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/Company.java Sat Sep 19 14:03:09
2009
@@ -203,7 +203,8 @@
         StringBuffer rc = new StringBuffer();
         rc.append(companyid);
         rc.append(", name ").append(name);
-        rc.append(", founded ").append(formatter.format(founded));
+        rc.append(", founded ").append(
+            founded==null ? "null" : formatter.format(founded));
         return rc.toString();
     }
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java
Sat Sep 19 14:03:09 2009
@@ -64,84 +64,84 @@
     public IAddress newAddress(long addrid, String street, String city, 
             String state, String zipcode, String country) {
         IAddress result = newAddress();
-        if (debug) logger.debug("newAddress returned" + result);
         result.setAddrid(addrid);
         result.setStreet(street);
         result.setCity(city);
         result.setState(state);
         result.setZipcode(zipcode);
         result.setCountry(country);
+        if (debug) logger.debug("newAddress returned" + result);
         return result;
     }
 
     public ICompany newCompany(long companyid, String name,
             java.util.Date founded) {
         ICompany result = newCompany();
-        if (debug) logger.debug("newCompany returned" + result);
         result.setCompanyid(companyid);
         result.setName(name);
         result.setFounded(founded);
+        if (debug) logger.debug("newCompany returned" + result);
         return result;
     }
 
     public ICompany newCompany(long companyid, String name, 
             java.util.Date founded, IAddress addr) {
         ICompany result = newCompany();
-        if (debug) logger.debug("newCompany returned" + result);
         result.setCompanyid(companyid);
         result.setName(name);
         result.setFounded(founded);
         result.setAddress(addr);
+        if (debug) logger.debug("newCompany returned" + result);
         return result;
     }
 
     public IDentalInsurance newDentalInsurance(long insid, String carrier, 
             java.math.BigDecimal lifetimeOrthoBenefit) {
         IDentalInsurance result = newDentalInsurance();
-        if (debug) logger.debug("newDentalInsurance returned" + result);
         result.setInsid(insid);
         result.setCarrier(carrier);
         result.setLifetimeOrthoBenefit(lifetimeOrthoBenefit);
+        if (debug) logger.debug("newDentalInsurance returned" + result);
         return result;
     }
 
     public IDentalInsurance newDentalInsurance(long insid, String carrier, 
             IEmployee employee, java.math.BigDecimal lifetimeOrthoBenefit) {
         IDentalInsurance result = newDentalInsurance();
-        if (debug) logger.debug("newDentalInsurance returned" + result);
         result.setInsid(insid);
         result.setCarrier(carrier);
         result.setEmployee(employee);
         result.setLifetimeOrthoBenefit(lifetimeOrthoBenefit);
+        if (debug) logger.debug("newDentalInsurance returned" + result);
         return result;
     }
 
     public IDepartment newDepartment(long deptid, String name) {
         IDepartment result = newDepartment();
-        if (debug) logger.debug("newDepartment returned" + result);
         result.setDeptid(deptid);
         result.setName(name);
+        if (debug) logger.debug("newDepartment returned" + result);
         return result;
     }
 
     public IDepartment newDepartment(long deptid, String name, 
             ICompany company) {
         IDepartment result = newDepartment();
-        if (debug) logger.debug("newDepartment returned" + result);
         result.setDeptid(deptid);
         result.setName(name);
         result.setCompany(company);
+        if (debug) logger.debug("newDepartment returned" + result);
         return result;
     }
 
     public IDepartment newDepartment(long deptid, String name, ICompany company,
             IEmployee employeeOfTheMonth) {
         IDepartment result = newDepartment();
-        if (debug) logger.debug("newDepartment returned" + result);
         result.setDeptid(deptid);
         result.setName(name);
         result.setCompany(company);
         result.setEmployeeOfTheMonth(employeeOfTheMonth);
+        if (debug) logger.debug("newDepartment returned" + result);
         return result;
     }
 
@@ -149,7 +149,6 @@
             String last, String middle, java.util.Date born,
             java.util.Date hired, double sal) {
         IFullTimeEmployee result = newFullTimeEmployee();
-        if (debug) logger.debug("newFullTimeEmployee returned" + result);
         result.setPersonid(personid);
         result.setFirstname(first);
         result.setLastname(last);
@@ -157,6 +156,7 @@
         result.setBirthdate(born);
         result.setHiredate(hired);
         result.setSalary(sal);
+        if (debug) logger.debug("newFullTimeEmployee returned" + result);
         return result;
     }
 
@@ -164,7 +164,6 @@
             String last, String middle, java.util.Date born, IAddress addr,
             java.util.Date hired, double sal) {
         IFullTimeEmployee result = newFullTimeEmployee();
-        if (debug) logger.debug("newFullTimeEmployee returned" + result);
         result.setPersonid(personid);
         result.setFirstname(first);
         result.setLastname(last);
@@ -173,27 +172,28 @@
         result.setAddress(addr);
         result.setHiredate(hired);
         result.setSalary(sal);
+        if (debug) logger.debug("newFullTimeEmployee returned" + result);
         return result;
     }
 
     public IMedicalInsurance newMedicalInsurance(long insid, String carrier,
             String planType) {
         IMedicalInsurance result = newMedicalInsurance();
-        if (debug) logger.debug("newMedicalInsurance returned" + result);
         result.setInsid(insid);
         result.setCarrier(carrier);
         result.setPlanType(planType);
+        if (debug) logger.debug("newMedicalInsurance returned" + result);
         return result;
     }
 
     public IMedicalInsurance newMedicalInsurance(long insid, String carrier, 
             IEmployee employee, String planType) {
         IMedicalInsurance result = newMedicalInsurance();
-        if (debug) logger.debug("newMedicalInsurance returned" + result);
         result.setInsid(insid);
         result.setCarrier(carrier);
         result.setEmployee(employee);
         result.setPlanType(planType);
+        if (debug) logger.debug("newMedicalInsurance returned" + result);
         return result;
     }
 
@@ -201,7 +201,6 @@
             String last, String middle, java.util.Date born, 
             java.util.Date hired, double wage) {
         IPartTimeEmployee result = newPartTimeEmployee();
-        if (debug) logger.debug("newPartTimeEmployee returned" + result);
         result.setPersonid(personid);
         result.setFirstname(first);
         result.setLastname(last);
@@ -209,6 +208,7 @@
         result.setBirthdate(born);
         result.setHiredate(hired);
         result.setWage(wage);
+        if (debug) logger.debug("newPartTimeEmployee returned" + result);
         return result;
     }
 
@@ -216,7 +216,6 @@
             String last, String middle, java.util.Date born, IAddress addr,
             java.util.Date hired, double wage) {
         IPartTimeEmployee result = newPartTimeEmployee();
-        if (debug) logger.debug("newPartTimeEmployee returned" + result);
         result.setPersonid(personid);
         result.setFirstname(first);
         result.setLastname(last);
@@ -225,16 +224,17 @@
         result.setAddress(addr);
         result.setHiredate(hired);
         result.setWage(wage);
+        if (debug) logger.debug("newPartTimeEmployee returned" + result);
         return result;
     }
 
     public IProject newProject(long projid, String name, 
             java.math.BigDecimal budget) {
         IProject result = newProject();
-        if (debug) logger.debug("newProject returned" + result);
         result.setProjid(projid);
         result.setName(name);
         result.setBudget(budget);
+        if (debug) logger.debug("newProject returned" + result);
         return result;
     }    
 }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/Employee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/Employee.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/Employee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/Employee.java Sat Sep 19 14:03:09
2009
@@ -425,7 +425,8 @@
     protected String getFieldRepr() {
         StringBuffer rc = new StringBuffer();
         rc.append(super.getFieldRepr());
-        rc.append(", hired ").append(formatter.format(hiredate));
+        rc.append(", hired ").append(
+            hiredate==null ? "null" : formatter.format(hiredate));
         rc.append(", weeklyhours ").append(weeklyhours);
         return rc.toString();
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/Person.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/Person.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/Person.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/company/Person.java Sat Sep 19 14:03:09
2009
@@ -260,7 +260,8 @@
         rc.append(personid);
         rc.append(", ").append(lastname);
         rc.append(", ").append(firstname);
-        rc.append(", born ").append(formatter.format(birthdate));
+        rc.append(", born ").append(
+            birthdate==null ? "null" : formatter.format(birthdate));
         rc.append(", phone ").append(phoneNumbers);
         return rc.toString();
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java
Sat Sep 19 14:03:09 2009
@@ -234,7 +234,8 @@
         StringBuffer rc = new StringBuffer();
         rc.append(companyid);
         rc.append(", name ").append(name);
-        rc.append(", founded ").append(formatter.format(founded));
+        rc.append(", founded ").append(
+            founded==null ? "null" : formatter.format(founded));
         return rc.toString();
     }
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java
Sat Sep 19 14:03:09 2009
@@ -463,7 +463,8 @@
     protected String getFieldRepr() {
         StringBuffer rc = new StringBuffer();
         rc.append(super.getFieldRepr());
-        rc.append(", hired ").append(formatter.format(hiredate));
+        rc.append(", hired ").append(
+            hiredate==null ? "null" : formatter.format(hiredate));
         rc.append(", weeklyhours ").append(weeklyhours);
         return rc.toString();
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java Sat
Sep 19 14:03:09 2009
@@ -291,7 +291,8 @@
         rc.append(personid);
         rc.append(", ").append(lastname);
         rc.append(", ").append(firstname);
-        rc.append(", born ").append(formatter.format(birthdate));
+        rc.append(", born ").append(
+            birthdate==null ? "null" : formatter.format(birthdate));
         rc.append(", phone ").append(phoneNumbers);
         return rc.toString();
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java Sat
Sep 19 14:03:09 2009
@@ -235,7 +235,8 @@
         StringBuffer rc = new StringBuffer();
         rc.append(companyid);
         rc.append(", name ").append(name);
-        rc.append(", founded ").append(formatter.format(founded));
+        rc.append(", founded ").append(
+            founded==null ? "null" : formatter.format(founded));
         return rc.toString();
     }
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
Sat Sep 19 14:03:09 2009
@@ -462,7 +462,8 @@
     protected String getFieldRepr() {
         StringBuffer rc = new StringBuffer();
         rc.append(super.getFieldRepr());
-        rc.append(", hired ").append(formatter.format(hiredate));
+        rc.append(", hired ").append(
+            hiredate==null ? "null" : formatter.format(hiredate));
         rc.append(", weeklyhours ").append(weeklyhours);
         return rc.toString();
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java Sat
Sep 19 14:03:09 2009
@@ -293,7 +293,8 @@
         rc.append(personid);
         rc.append(", ").append(lastname);
         rc.append(", ").append(firstname);
-        rc.append(", born ").append(formatter.format(birthdate));
+        rc.append(", born ").append(
+            birthdate==null ? "null" : formatter.format(birthdate));
         rc.append(", phone ").append(phoneNumbers);
         return rc.toString();
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java
Sat Sep 19 14:03:09 2009
@@ -243,7 +243,8 @@
         StringBuffer rc = new StringBuffer();
         rc.append(companyid);
         rc.append(", name ").append(name);
-        rc.append(", founded ").append(formatter.format(founded));
+        rc.append(", founded ").append(
+            founded==null ? "null" : formatter.format(founded));
         return rc.toString();
     }
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java
Sat Sep 19 14:03:09 2009
@@ -475,7 +475,8 @@
     protected String getFieldRepr() {
         StringBuffer rc = new StringBuffer();
         rc.append(super.getFieldRepr());
-        rc.append(", hired ").append(formatter.format(hiredate));
+        rc.append(", hired ").append(
+            hiredate==null ? "null" : formatter.format(hiredate));
         rc.append(", weeklyhours ").append(weeklyhours);
         return rc.toString();
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java
Sat Sep 19 14:03:09 2009
@@ -332,7 +332,8 @@
         rc.append(personid);
         rc.append(", ").append(lastname);
         rc.append(", ").append(firstname);
-        rc.append(", born ").append(formatter.format(birthdate));
+        rc.append(", born ").append(
+            birthdate==null ? "null" : formatter.format(birthdate));
         rc.append(", phone ").append(convertPhone2String(phoneNumbers));
         return rc.toString();
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java
Sat Sep 19 14:03:09 2009
@@ -243,7 +243,8 @@
         StringBuffer rc = new StringBuffer();
         rc.append(_companyid);
         rc.append(", name ").append(_name);
-        rc.append(", founded ").append(formatter.format(_founded));
+        rc.append(", founded ").append(
+            _founded==null ? "null" : formatter.format(_founded));
         return rc.toString();
     }
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java
Sat Sep 19 14:03:09 2009
@@ -495,7 +495,8 @@
     protected String getFieldRepr() {
         StringBuffer rc = new StringBuffer();
         rc.append(super.getFieldRepr());
-        rc.append(", hired ").append(formatter.format(_hiredate));
+        rc.append(", hired ").append(
+            _hiredate==null ? "null" : formatter.format(_hiredate));
         rc.append(", weeklyhours ").append(_weeklyhours);
         return rc.toString();
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java Sat
Sep 19 14:03:09 2009
@@ -297,7 +297,8 @@
         rc.append(_personid);
         rc.append(", ").append(_lastname);
         rc.append(", ").append(_firstname);
-        rc.append(", born ").append(formatter.format(_birthdate));
+        rc.append(", born ").append(
+            _birthdate==null ? "null" : formatter.format(_birthdate));
         rc.append(", phone ").append(_phoneNumbers);
         return rc.toString();
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java Sat
Sep 19 14:03:09 2009
@@ -248,7 +248,8 @@
         StringBuffer rc = new StringBuffer();
         rc.append(_companyid);
         rc.append(", name ").append(_name);
-        rc.append(", founded ").append(formatter.format(_founded));
+        rc.append(", founded ").append(
+            _founded==null ? "null" : formatter.format(_founded));
         return rc.toString();
     }
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java
Sat Sep 19 14:03:09 2009
@@ -506,7 +506,8 @@
     protected String getFieldRepr() {
         StringBuffer rc = new StringBuffer();
         rc.append(super.getFieldRepr());
-        rc.append(", hired ").append(formatter.format(_hiredate));
+        rc.append(", hired ").append(
+            _hiredate==null ? "null" : formatter.format(_hiredate));
         rc.append(", weeklyhours ").append(_weeklyhours);
         return rc.toString();
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java Sat
Sep 19 14:03:09 2009
@@ -297,7 +297,8 @@
         rc.append(_personid);
         rc.append(", ").append(_lastname);
         rc.append(", ").append(_firstname);
-        rc.append(", born ").append(formatter.format(_birthdate));
+        rc.append(", born ").append(
+            _birthdate==null ? "null" : formatter.format(_birthdate));
         rc.append(", phone ").append(_phoneNumbers);
         return rc.toString();
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java Sat
Sep 19 14:03:09 2009
@@ -174,7 +174,8 @@
         StringBuffer rc = new StringBuffer();
         rc.append(companyid);
         rc.append(", name ").append(name);
-        rc.append(", founded ").append(formatter.format(founded));
+        rc.append(", founded ").append(
+            founded==null ? "null" : formatter.format(founded));
         return rc.toString();
     }
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java
Sat Sep 19 14:03:09 2009
@@ -52,28 +52,28 @@
     public ICompany newCompany(long companyid, String name,
             java.util.Date founded) {
         ICompany result = newCompany();
-        if (debug) logger.debug("newCompany returned" + result);
         result.setCompanyid(companyid);
         result.setName(name);
         result.setFounded(founded);
+        if (debug) logger.debug("newCompany returned" + result);
         return result;
     }
 
     public IDepartment newDepartment(long deptid, String name) {
         IDepartment result = newDepartment();
-        if (debug) logger.debug("newDepartment returned" + result);
         result.setDeptid(deptid);
         result.setName(name);
+        if (debug) logger.debug("newDepartment returned" + result);
         return result;
     }
 
 
     public IDepartment newDepartment(long deptid, String name, ICompany company) {
         IDepartment result = newDepartment();
-        if (debug) logger.debug("newDepartment returned" + result);
         result.setDeptid(deptid);
         result.setName(name);
         result.setCompany(company);
+        if (debug) logger.debug("newDepartment returned" + result);
         return result;
     }
 
@@ -81,7 +81,6 @@
             String last, String middle, java.util.Date born,
                     java.util.Date hired, double sal) {
         IFullTimeEmployee result = newFullTimeEmployee();
-        if (debug) logger.debug("newFullTimeEmployee returned" + result);
         result.setPersonid(personid);
         result.setFirstname(first);
         result.setLastname(last);
@@ -89,6 +88,7 @@
         result.setBirthdate(born);
         result.setHiredate(hired);
         result.setSalary(sal);
+        if (debug) logger.debug("newFullTimeEmployee returned" + result);
         return result;
     }
 
@@ -96,7 +96,6 @@
             String last, String middle, java.util.Date born,
                     java.util.Date hired, double wage) {
         IPartTimeEmployee result = newPartTimeEmployee();
-        if (debug) logger.debug("newPartTimeEmployee returned" + result);
         result.setPersonid(personid);
         result.setFirstname(first);
         result.setLastname(last);
@@ -104,6 +103,7 @@
         result.setBirthdate(born);
         result.setHiredate(hired);
         result.setWage(wage);
+        if (debug) logger.debug("newPartTimeEmployee returned" + result);
         return result;
     }
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java
Sat Sep 19 14:03:09 2009
@@ -299,7 +299,8 @@
     protected String getFieldRepr() {
         StringBuffer rc = new StringBuffer();
         rc.append(super.getFieldRepr());
-        rc.append(", hired ").append(formatter.format(hiredate));
+        rc.append(", hired ").append(
+            hiredate==null ? "null" : formatter.format(hiredate));
         rc.append(", weeklyhours ").append(weeklyhours);
         return rc.toString();
     }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java Sat
Sep 19 14:03:09 2009
@@ -171,7 +171,8 @@
         rc.append(personid);
         rc.append(", ").append(lastname);
         rc.append(", ").append(firstname);
-        rc.append(", born ").append(formatter.format(birthdate));
+        rc.append(", born ").append(
+            birthdate==null ? "null" : formatter.format(birthdate));
         return rc.toString();
     }
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Company.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Company.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Company.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Company.java Sat
Sep 19 14:03:09 2009
@@ -174,7 +174,8 @@
         StringBuffer rc = new StringBuffer();
         rc.append(companyid);
         rc.append(", name ").append(name);
-        rc.append(", founded ").append(formatter.format(founded));
+        rc.append(", founded ").append(
+            founded==null ? "null" : formatter.format(founded));
         return rc.toString();
     }
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java
Sat Sep 19 14:03:09 2009
@@ -52,28 +52,28 @@
     public ICompany newCompany(long companyid, String name,
             java.util.Date founded) {
         ICompany result = newCompany();
-        if (debug) logger.debug("newCompany returned" + result);
         result.setCompanyid(companyid);
         result.setName(name);
         result.setFounded(founded);
+        if (debug) logger.debug("newCompany returned" + result);
         return result;
     }
 
     public IDepartment newDepartment(long deptid, String name) {
         IDepartment result = newDepartment();
-        if (debug) logger.debug("newDepartment returned" + result);
         result.setDeptid(deptid);
         result.setName(name);
+        if (debug) logger.debug("newDepartment returned" + result);
         return result;
     }
 
 
     public IDepartment newDepartment(long deptid, String name, ICompany company) {
         IDepartment result = newDepartment();
-        if (debug) logger.debug("newDepartment returned" + result);
         result.setDeptid(deptid);
         result.setName(name);
         result.setCompany(company);
+        if (debug) logger.debug("newDepartment returned" + result);
         return result;
     }
 
@@ -81,7 +81,6 @@
             String last, String middle, java.util.Date born,
                     java.util.Date hired, String role, double sal) {
         IFullTimeEmployee result = newFullTimeEmployee();
-        if (debug) logger.debug("newFullTimeEmployee returned" + result);
         result.setPersonid(personid);
         result.setFirstname(first);
         result.setLastname(last);
@@ -90,6 +89,7 @@
         result.setHiredate(hired);
         result.setRole(role);
         result.setSalary(sal);
+        if (debug) logger.debug("newFullTimeEmployee returned" + result);
         return result;
     }
 
@@ -97,7 +97,6 @@
             String last, String middle, java.util.Date born,
                     java.util.Date hired, String role, double wage) {
         IPartTimeEmployee result = newPartTimeEmployee();
-        if (debug) logger.debug("newPartTimeEmployee returned" + result);
         result.setPersonid(personid);
         result.setFirstname(first);
         result.setLastname(last);
@@ -106,6 +105,7 @@
         result.setHiredate(hired);
         result.setRole(role);
         result.setWage(wage);
+        if (debug) logger.debug("newPartTimeEmployee returned" + result);
         return result;
     }
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java Sat
Sep 19 14:03:09 2009
@@ -319,7 +319,8 @@
     protected String getFieldRepr() {
         StringBuffer rc = new StringBuffer();
         rc.append(super.getFieldRepr());
-        rc.append(", hired ").append(formatter.format(hiredate));
+        rc.append(", hired ").append(
+            hiredate==null ? "null" : formatter.format(hiredate));
         rc.append(", weeklyhours ").append(weeklyhours);
         rc.append(", role ").append(role);
         return rc.toString();

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Person.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Person.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Person.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Person.java Sat
Sep 19 14:03:09 2009
@@ -173,7 +173,8 @@
         rc.append(personid);
         rc.append(", ").append(lastname);
         rc.append(", ").append(firstname);
-        rc.append(", born ").append(formatter.format(birthdate));
+        rc.append(", born ").append(
+            birthdate==null ? "null" : formatter.format(birthdate));
         return rc.toString();
     }
 

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/order/OrderFactoryAbstractImpl.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/order/OrderFactoryAbstractImpl.java?rev=816927&r1=816926&r2=816927&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/order/OrderFactoryAbstractImpl.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/order/OrderFactoryAbstractImpl.java Sat
Sep 19 14:03:09 2009
@@ -51,29 +51,29 @@
 
     public Order newOrder(long orderId, long customerId) {
         Order result = newOrder();
-        if (debug) logger.debug("newOrder returned" + result);
         result.setOrderId(orderId);
         result.setCustomerId(customerId);
+        if (debug) logger.debug("newOrder returned" + result);
         return result;
     }
 
     public Order newOrder(long orderId, Set items, long customerId) {
         Order result = newOrder();
-        if (debug) logger.debug("newOrder returned" + result);
         result.setOrderId(orderId);
         result.setItems(items);
         result.setCustomerId(customerId);
+        if (debug) logger.debug("newOrder returned" + result);
         return result;
     }
 
     public OrderItem newOrderItem(Order order, long item, String description,
             int quantity) {
         OrderItem result = newOrderItem();
-        if (debug) logger.debug("newOrderItem returned" + result);
         result.setOrder(order);
         result.setItem(item);
         result.setDescription(description);
         result.setQuantity(quantity);
+        if (debug) logger.debug("newOrderItem returned" + result);
         return result;
     }
 }



Mime
View raw message