View | Details | Raw Unified | Return to bug 38216
Collapse All | Expand All

(-)java/org/apache/catalina/manager/JMXProxyServlet.java (-4 / +20 lines)
Lines 126-133 Link Here
126
        try {
126
        try {
127
            ObjectName oname = new ObjectName(onameStr);
127
            ObjectName oname = new ObjectName(onameStr);
128
            Object value = mBeanServer.getAttribute(oname, att);
128
            Object value = mBeanServer.getAttribute(oname, att);
129
            String valueStr;
130
            if (value != null) {
131
                valueStr = value.toString();
132
            } else {
133
                valueStr = "<null>";
134
            }
129
            writer.println("OK - Attribute get '" + onameStr + "' - " + att
135
            writer.println("OK - Attribute get '" + onameStr + "' - " + att
130
                    + "= " + MBeanDumper.escape(value.toString()));
136
                    + "= " + MBeanDumper.escape(valueStr));
131
        } catch (Exception ex) {
137
        } catch (Exception ex) {
132
            writer.println("Error - " + ex.toString());
138
            writer.println("Error - " + ex.toString());
133
            ex.printStackTrace(writer);
139
            ex.printStackTrace(writer);
Lines 193-200 Link Here
193
           }
199
           }
194
200
195
            Object retVal = mBeanServer.invoke(oname,op,values,signatureTypes);
201
            Object retVal = mBeanServer.invoke(oname,op,values,signatureTypes);
196
            writer.println("OK - Operation " + op + " returned:");
202
            if (retVal != null) {
197
            output("", writer, retVal);
203
                writer.println("OK - Operation " + op + " returned:");
204
                output("", writer, retVal);
205
            } else {
206
                writer.println("OK - Operation " + op + " without return value");
207
            }
198
        } catch( Exception ex ) {
208
        } catch( Exception ex ) {
199
            writer.println("Error - " + ex.toString());
209
            writer.println("Error - " + ex.toString());
200
            ex.printStackTrace(writer);
210
            ex.printStackTrace(writer);
Lines 207-213 Link Here
207
                output("  " + indent, writer, obj);
217
                output("  " + indent, writer, obj);
208
            }
218
            }
209
        } else {
219
        } else {
210
            writer.println(indent + result.toString());
220
            String strValue;
221
            if (result != null) {
222
                strValue = result.toString();
223
            } else {
224
                strValue = "<null>";
225
            }
226
            writer.println(indent + strValue);
211
        }
227
        }
212
    }
228
    }
213
}
229
}

Return to bug 38216