Skip to content

Commit 8f5970d

Browse files
markt-asfmarkt-asf
committed
Patch provided by sebb git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@832945 13f79535-47bb-0310-9956-ffa450edef68
1 parent a3fa5d3 commit 8f5970d

215 files changed

Lines changed: 808 additions & 9 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎java/org/apache/catalina/ContainerEvent.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ public String getType() {
101101
/**
102102
* Return a string representation of this event.
103103
*/
104+
@Override
104105
public String toString() {
105106

106107
return ("ContainerEvent['" + getContainer() + "','" +

‎java/org/apache/catalina/LifecycleException.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ public LifecycleException(String message, Throwable throwable) {
105105
/**
106106
* Returns the message associated with this exception, if any.
107107
*/
108+
@Override
108109
public String getMessage() {
109110

110111
return (message);
@@ -125,6 +126,7 @@ public Throwable getThrowable() {
125126
/**
126127
* Return a formatted string that describes this exception.
127128
*/
129+
@Override
128130
public String toString() {
129131

130132
StringBuilder sb = new StringBuilder("LifecycleException: ");

‎java/org/apache/catalina/SessionEvent.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ public String getType() {
101101
/**
102102
* Return a string representation of this event.
103103
*/
104+
@Override
104105
public String toString() {
105106

106107
return ("SessionEvent['" + getSession() + "','" +

‎java/org/apache/catalina/ant/AbstractCatalinaTask.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ public void setUsername(String username) {
121121
*
122122
* @exception BuildException if a validation error occurs
123123
*/
124+
@Override
124125
public void execute() throws BuildException {
125126

126127
if ((username == null) || (password == null) || (url == null)) {

‎java/org/apache/catalina/ant/BaseRedirectorHelperTask.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ protected void closeRedirector() {
285285
*
286286
* @param output The output to log. Should not be <code>null</code>.
287287
*/
288+
@Override
288289
protected void handleOutput(String output) {
289290
if (redirectOutput) {
290291
if (redirectOutPrintStream == null) {
@@ -305,6 +306,7 @@ protected void handleOutput(String output) {
305306
* @param output The output to log. Should not be <code>null</code>.
306307
*
307308
*/
309+
@Override
308310
protected void handleFlush(String output) {
309311
handleOutput(output);
310312
redirectOutPrintStream.flush();
@@ -315,6 +317,7 @@ protected void handleFlush(String output) {
315317
*
316318
* @param output The error output to log. Should not be <code>null</code>.
317319
*/
320+
@Override
318321
protected void handleErrorOutput(String output) {
319322
if (redirectOutput) {
320323
if (redirectErrPrintStream == null) {
@@ -335,6 +338,7 @@ protected void handleErrorOutput(String output) {
335338
* @param output The error output to log. Should not be <code>null</code>.
336339
*
337340
*/
341+
@Override
338342
protected void handleErrorFlush(String output) {
339343
handleErrorOutput(output);
340344
redirectErrPrintStream.flush();

‎java/org/apache/catalina/ant/DeployTask.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ public void setWar(String war) {
137137
*
138138
* @exception BuildException if an error occurs
139139
*/
140+
@Override
140141
public void execute() throws BuildException {
141142

142143
super.execute();

‎java/org/apache/catalina/ant/JKStatusUpdateTask.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ public void setWorkerRedirect(String workerRedirect) {
268268
* @exception BuildException
269269
* if an error occurs
270270
*/
271+
@Override
271272
public void execute() throws BuildException {
272273

273274
super.execute();

‎java/org/apache/catalina/ant/JMXGetTask.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public void setAttribute (String attribute) {
8282
*
8383
* @exception BuildException if an error occurs
8484
*/
85+
@Override
8586
public void execute() throws BuildException {
8687
super.execute();
8788
if (bean == null || attribute == null) {

‎java/org/apache/catalina/ant/JMXQueryTask.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public void setQuery (String query) {
7070
*
7171
* @exception BuildException if an error occurs
7272
*/
73+
@Override
7374
public void execute() throws BuildException {
7475
super.execute();
7576
String queryString = (query == null) ? "":("?qry="+query);

‎java/org/apache/catalina/ant/JMXSetTask.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public void setValue (String value) {
103103
*
104104
* @exception BuildException if an error occurs
105105
*/
106+
@Override
106107
public void execute() throws BuildException {
107108
super.execute();
108109
if (bean == null || attribute == null || value == null) {

0 commit comments

Comments
 (0)