[geode] branch develop updated: GEODE-5529: remove SchedulingOrder. (#2261)

[go...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gosullivan pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 3a72da7  GEODE-5529: remove SchedulingOrder. (#2261)
3a72da7 is described below

commit 3a72da70bdbd9aa848939d9406c4e3bad2a950d8
Author: Galen O'Sullivan <go...@pivotal.io>
AuthorDate: Mon Aug 6 12:38:35 2018 -0700

    GEODE-5529: remove SchedulingOrder. (#2261)
---
 .../java/hydra/MethExecutorResult.java             | 29 +++++++-----------
 .../java/hydra/SchedulingOrder.java                | 34 ----------------------
 2 files changed, 11 insertions(+), 52 deletions(-)

diff --git a/geode-core/src/integrationTest/java/hydra/MethExecutorResult.java b/geode-core/src/integrationTest/java/hydra/MethExecutorResult.java
index acdcb34..8c005d0 100644
--- a/geode-core/src/integrationTest/java/hydra/MethExecutorResult.java
+++ b/geode-core/src/integrationTest/java/hydra/MethExecutorResult.java
@@ -95,26 +95,19 @@ public class MethExecutorResult implements Serializable {
 
     StringWriter sw = new StringWriter();
 
-    if (thr instanceof SchedulingOrder) {
-      this.stackTrace = "No stack trace for SchedulingOrder\n";
-      this.exception = thr;
-
+    thr.printStackTrace(new PrintWriter(sw, true));
+    this.stackTrace = sw.toString();
 
-    } else {
-      thr.printStackTrace(new PrintWriter(sw, true));
-      this.stackTrace = sw.toString();
-
-      try {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ObjectOutputStream oos = new ObjectOutputStream(baos);
-        oos.writeObject(thr);
-        this.exception = thr;
+    try {
+      ByteArrayOutputStream baos = new ByteArrayOutputStream();
+      ObjectOutputStream oos = new ObjectOutputStream(baos);
+      oos.writeObject(thr);
+      this.exception = thr;
 
-      } catch (IOException ex) {
-        sw = new StringWriter();
-        ex.printStackTrace(new PrintWriter(sw, true));
-        this.exception = new IOException(sw.toString());
-      }
+    } catch (IOException ex) {
+      sw = new StringWriter();
+      ex.printStackTrace(new PrintWriter(sw, true));
+      this.exception = new IOException(sw.toString());
     }
   }
 
diff --git a/geode-core/src/integrationTest/java/hydra/SchedulingOrder.java b/geode-core/src/integrationTest/java/hydra/SchedulingOrder.java
deleted file mode 100644
index a0623c6..0000000
--- a/geode-core/src/integrationTest/java/hydra/SchedulingOrder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package hydra;
-
-import org.apache.geode.GemFireException;
-
-/**
- * Abstract class for clients giving scheduling instructions to the hydra master.
- * <p>
- * Use the arguments to give the reason for the exception.
- */
-
-public abstract class SchedulingOrder extends GemFireException {
-  public SchedulingOrder() {
-    super();
-  }
-
-  public SchedulingOrder(String s) {
-    super(s);
-  }
-}