Index: appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerService.java
===================================================================
--- appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerService.java	(revision 51535)
+++ appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerService.java	(working copy)
@@ -1793,99 +1793,18 @@
 
     } //TimerCache{}
 
-    private File getTimerServiceShutdownFile() throws Exception {
-        File timerServiceShutdownFile = null;
 
-        String j2eeAppPath = 
-                ConfigBeansUtilities.getLocation(appID);
-
-        File timerServiceShutdownDirectory = new File(j2eeAppPath + File.separator);
-        if (!timerServiceShutdownDirectory.mkdirs()) {
-            if( logger.isLoggable(Level.FINE) ) {
-                logger.log(Level.FINE, "Failed to create timerServiceShutdownDirectory");
-            }
-        }
-        timerServiceShutdownFile = new File(j2eeAppPath + File.separator
-                    + TIMER_SERVICE_FILE);
-
-        return timerServiceShutdownFile;
-    }
-
-    private long getTimerServiceDownAt() {
-        long timerServiceWentDownAt = -1;
-        BufferedReader br = null;
-        try {
-            File timerServiceShutdownFile  = getTimerServiceShutdownFile();
-
-            if (timerServiceShutdownFile.exists()) {
-                DateFormat dateFormat =  
-                    new SimpleDateFormat(TIMER_SERVICE_DOWNTIME_FORMAT);
-        
-                FileReader fr = new FileReader(timerServiceShutdownFile);
-                br = new BufferedReader(fr, 128);
-                String line = br.readLine();
-
-                if (line != null) {
-                    Date myDate = dateFormat.parse(line);
-                    timerServiceWentDownAt = myDate.getTime();
-                    logger.log(Level.INFO, "ejb.timer_service_last_shutdown",
-                               new Object[] { line });
-                } else {
-                    logger.log(Level.WARNING, "ejb.timer_service_shutdown_unknown",
-                               new Object[] { timerServiceShutdownFile });
-                }
-            } else {
-                logger.log(Level.WARNING, "ejb.timer_service_shutdown_unknown",
-                           new Object[] { timerServiceShutdownFile });
-            }
-        } catch (Throwable th) {
-            logger.log(Level.WARNING, "ejb.timer_service_shutdown_unknown",
-                       new Object[] { "" });
-            logger.log(Level.WARNING, "", th);
-        } finally {
-            if (br != null) {
-                try {
-                    br.close();
-                } catch (Exception ex) {
-                    logger.log(Level.FINE, "Error closing timer service shutdown file", ex);
-                }
-            }
-        }
-        return timerServiceWentDownAt;
-    }
-
-
     /**
      * Called from TimerBeanContainer
      */
     public void onShutdown() {
         shutdown();
-        try {
-            DateFormat dateFormat =  
-                new SimpleDateFormat(TIMER_SERVICE_DOWNTIME_FORMAT);
-            String downTimeStr = dateFormat.format(new Date());
+        DateFormat dateFormat =  
+            new SimpleDateFormat(TIMER_SERVICE_DOWNTIME_FORMAT);
+        String downTimeStr = dateFormat.format(new Date());
 
-            File timerServiceShutdownFile  = getTimerServiceShutdownFile();
-            if (timerServiceShutdownFile.exists()) {
-                FileWriter fw = new FileWriter(timerServiceShutdownFile);
-                PrintWriter pw = new PrintWriter(fw);
-
-                pw.println(downTimeStr);
-
-                pw.flush();
-                pw.close();
-                fw.close();
-                logger.log(Level.INFO, "ejb.timer_service_shutdown_msg",
-                       new Object[] { downTimeStr });
-            } else {
-                logger.log(Level.WARNING, "ejb.timer_service_shutdown_unknown",
-                       new Object[] { TIMER_SERVICE_FILE });
-            } 
-        } catch (Throwable th) {
-            logger.log(Level.WARNING, "ejb.timer_service_shutdown_unknown",
-                       new Object[] { TIMER_SERVICE_FILE });
-            logger.log(Level.WARNING, "", th);
-        }
+        logger.log(Level.INFO, "ejb.timer_service_shutdown_msg",
+               new Object[] { downTimeStr });
     }
 
 
Index: appserver/ejb/ejb-container/src/main/resources/com/sun/logging/enterprise/system/container/ejb/LogStrings.properties
===================================================================
--- appserver/ejb/ejb-container/src/main/resources/com/sun/logging/enterprise/system/container/ejb/LogStrings.properties	(revision 51535)
+++ appserver/ejb/ejb-container/src/main/resources/com/sun/logging/enterprise/system/container/ejb/LogStrings.properties	(working copy)
@@ -152,8 +152,6 @@
 EJB5117.diag.check.1=Double-check the JDBC data source (and its associated connection pool) assigned to the timer-datasource element in domain.xml.  Common causes are that the database is not running, the timer table has not been created within that database, or that the connection pool's JDBC driver URL information is incorrect.
 ejb.remove_timer_failure=EJB5118:Failure removing timer bean [{0}]
 ejb.timer_exceeded_max_deliveries=EJB5119:Expunging timer [{0}] after [{1}] failed deliveries
-ejb.timer_service_last_shutdown=EJB5120:EJB Timer Service last shutdown at [{0}]
-ejb.timer_service_shutdown_unknown=EJB5121:EJB Timer Service shutdown info [{0}] not found or is corrupted.  Shutdown time unknown.
 ejb.timer_service_shutdown_msg=EJB5122:EJB Timer Service shutdown at [{0}]
 ejb.tx_timeout=EJB5123:Rolling back timed out transaction [{0}] for [{1}]
 ejb.commit_option_A_not_supported=EJB5124:Commit Option A is not currently supported.  Using Commit Option B for [{0}]