← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/tomcat6/oneiric

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/manager/ManagerServlet.java

  • Committer: Bazaar Package Importer
  • Author(s): Thierry Carrez
  • Date: 2010-07-20 14:36:48 UTC
  • mfrom: (2.2.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100720143648-23y81x6cq1kv1z00
Tags: 6.0.28-2
* Add debconf questions for user, group and Java options.
* Use ucf to install /etc/default/tomcat6 from a template
* Drop CATALINA_BASE and CATALINA_HOME from /etc/default/tomcat6 since we
  shouldn't encourage users to change those anyway

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/catalina/manager/ManagerServlet.java
158
158
 *
159
159
 * @author Craig R. McClanahan
160
160
 * @author Remy Maucherat
161
 
 * @version $Revision: 915603 $ $Date: 2010-02-24 01:07:06 +0100 (Mi, 24. Feb 2010) $
 
161
 * @version $Id: ManagerServlet.java 939518 2010-04-30 00:08:58Z kkolinko $
162
162
 */
163
163
 
164
164
public class ManagerServlet
1175
1175
                int time = (int)((now-sessions[i].getLastAccessedTimeInternal())/1000);
1176
1176
                if (idle >= 0 && time >= idle*60) {
1177
1177
                    sessions[i].expire();
1178
 
                    idle++;
 
1178
                    expired++;
1179
1179
                }
1180
1180
                time=time/60/histoInterval;
1181
1181
                if (time < 0)
1199
1199
                                            ">=" + maxCount*histoInterval,
1200
1200
                                            "" + timeout[maxCount-1]));
1201
1201
            if (notimeout > 0)
1202
 
                writer.println(sm.getString("managerServlet.sessiontimeout",
1203
 
                                            "unlimited","" + notimeout));
 
1202
                writer.println(sm.getString("managerServlet.sessiontimeout.unlimited",
 
1203
                                            "" + notimeout));
1204
1204
            if (idle >= 0)
1205
 
                writer.println(sm.getString("managerServlet.sessiontimeout",
1206
 
                                            "" + idle,"expired " + expired));
 
1205
                writer.println(sm.getString("managerServlet.sessiontimeout.expired",
 
1206
                                            "" + idle,"" + expired));
1207
1207
        } catch (Throwable t) {
1208
1208
            log("ManagerServlet.sessions[" + displayPath + "]", t);
1209
1209
            writer.println(sm.getString("managerServlet.exception",