Index: ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerService.java
===================================================================
--- ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerService.java	(revision 32009)
+++ ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerService.java	(working copy)
@@ -707,7 +707,7 @@
             timerLocal_.cancelTimers(timers);
         } catch(Exception e) {
             logger.log(Level.WARNING, "ejb.cancel_entity_timers",
-                       new Object[] { new Long(containerId), primaryKey });
+                       new Object[] { String.valueOf(containerId), primaryKey });
             logger.log(Level.WARNING, "", e);
         }
     }
@@ -767,8 +767,8 @@
             }
 
         } catch(Exception ex) {
-            logger.log(Level.WARNING, "destroy_timers_error",
-                       new Object[] { new Long(containerId) });
+            logger.log(Level.WARNING, "ejb.destroy_timers_error",
+                       new Object[] { String.valueOf(containerId) });
             logger.log(Level.WARNING, "", ex);
             return;
         } finally {
@@ -777,8 +777,8 @@
             } catch(Exception e) {
                 // Most likely caused by two or more server instances trying
                 // to delete the timers for the same ejb at the same time.
-                logger.log(Level.WARNING, "destroy_timers_error",
-                           new Object[] { new Long(containerId) });
+                logger.log(Level.WARNING, "ejb.destroy_timers_error",
+                           new Object[] { String.valueOf(containerId) });
                 logger.log(Level.WARNING, "", e);
             }
         }
@@ -1114,7 +1114,7 @@
                 }
             } catch(Exception e) {
                 logger.log(Level.SEVERE, "ejb.create_timer_failure",
-                           new Object[] { new Long(containerId), 
+                           new Object[] { String.valueOf(containerId), 
                                           timedObjectPrimaryKey,
                                           timerConfig.getInfo() });
                 logger.log(Level.SEVERE, "", e);