Index: tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java	(Arbeitskopie)
@@ -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();
     }
Index: tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java	(Arbeitskopie)
@@ -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();
     }
 
Index: tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java	(Arbeitskopie)
@@ -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();
     }
Index: tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java	(Arbeitskopie)
@@ -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();
     }
Index: tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java	(Arbeitskopie)
@@ -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();
     }
Index: tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java	(Arbeitskopie)
@@ -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();
     }
 
Index: tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java	(Arbeitskopie)
@@ -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();
     }
Index: tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java	(Arbeitskopie)
@@ -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();
     }
 
Index: tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java	(Arbeitskopie)
@@ -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();
     }
Index: tck2/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java	(Arbeitskopie)
@@ -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;
     }    
 }
Index: tck2/src/java/org/apache/jdo/tck/pc/company/Person.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/company/Person.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/company/Person.java	(Arbeitskopie)
@@ -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();
     }
Index: tck2/src/java/org/apache/jdo/tck/pc/company/Company.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/company/Company.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/company/Company.java	(Arbeitskopie)
@@ -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();
     }
 
Index: tck2/src/java/org/apache/jdo/tck/pc/company/Employee.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/company/Employee.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/company/Employee.java	(Arbeitskopie)
@@ -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();
     }
Index: tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java	(Arbeitskopie)
@@ -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;
     }
 
Index: tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java	(Arbeitskopie)
@@ -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();
     }
 
Index: tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java	(Arbeitskopie)
@@ -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();
     }
 
Index: tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java	(Arbeitskopie)
@@ -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();
     }
Index: tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java	(Arbeitskopie)
@@ -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;
     }
 
Index: tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Person.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Person.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Person.java	(Arbeitskopie)
@@ -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();
     }
 
Index: tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Company.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Company.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Company.java	(Arbeitskopie)
@@ -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();
     }
 
Index: tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java	(Arbeitskopie)
@@ -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();
Index: tck2/src/java/org/apache/jdo/tck/pc/order/OrderFactoryAbstractImpl.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/order/OrderFactoryAbstractImpl.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/order/OrderFactoryAbstractImpl.java	(Arbeitskopie)
@@ -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;
     }
 }
Index: tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java	(Arbeitskopie)
@@ -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();
     }
Index: tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java	(Arbeitskopie)
@@ -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();
     }
 
Index: tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java	(Arbeitskopie)
@@ -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();
     }
Index: tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java	(Arbeitskopie)
@@ -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();
     }
 
Index: tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java	(Arbeitskopie)
@@ -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();
     }
Index: tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java
===================================================================
--- tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java	(Revision 816680)
+++ tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java	(Arbeitskopie)
@@ -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();
     }