You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2016/07/06 14:12:36 UTC
svn commit: r1751684 -
/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/agent/metrics/swap/DuccProcessMemoryPageLoadUsage.java
Author: cwiklik
Date: Wed Jul 6 14:12:36 2016
New Revision: 1751684
URL: http://svn.apache.org/viewvc?rev=1751684&view=rev
Log:
UIMA-4989 check is var before referencing
Modified:
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/agent/metrics/swap/DuccProcessMemoryPageLoadUsage.java
Modified: uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/agent/metrics/swap/DuccProcessMemoryPageLoadUsage.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/agent/metrics/swap/DuccProcessMemoryPageLoadUsage.java?rev=1751684&r1=1751683&r2=1751684&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/agent/metrics/swap/DuccProcessMemoryPageLoadUsage.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/agent/metrics/swap/DuccProcessMemoryPageLoadUsage.java Wed Jul 6 14:12:36 2016
@@ -39,32 +39,36 @@ public class DuccProcessMemoryPageLoadUs
builder.redirectErrorStream(true);
Process process = builder.start();
InputStream is = process.getInputStream();
- InputStreamReader isr = new InputStreamReader(is);
- BufferedReader br = new BufferedReader(isr);
- String line;
- int count = 0;
- String faults = null;
- try {
- while ((line = br.readLine()) != null) {
- // skip the header line
- if (count == 1) {
- faults = line.trim();
+ if ( is != null ) {
+ InputStreamReader isr = new InputStreamReader(is);
+ BufferedReader br = new BufferedReader(isr);
+ String line;
+ int count = 0;
+ String faults = null;
+ try {
+ while ((line = br.readLine()) != null) {
+ // skip the header line
+ if (count == 1) {
+ faults = line.trim();
+ }
+ count++;
}
- count++;
+ } finally {
+ if (is != null) {
+ is.close();
+ }
+ process.waitFor();
+ process.destroy();
}
- } finally {
- if (is != null) {
- is.close();
+ if ( faults != null) {
+ return Long.parseLong(faults.trim());
+ } else {
+ return 0;
}
- process.waitFor();
- process.destroy();
+
}
+ return 0;
- if ( faults != null) {
- return Long.parseLong(faults.trim());
- } else {
- return 0;
- }
}
}