- Fixes as per @aaime review

geoserver · Sep 21, 2018 · 4bee008 · 4bee008
1 parent b7da171
commit 4bee008
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/extension/wps/web-wps/src/main/java/org/geoserver/wps/web/ProcessStatusProvider.java b/src/extension/wps/web-wps/src/main/java/org/geoserver/wps/web/ProcessStatusProvider.java
@@ -23,7 +23,6 @@
 import org.geoserver.wps.executor.ProcessStatusTracker;
 import org.geotools.data.Query;
 import org.geotools.factory.CommonFactoryFinder;
-import org.geotools.filter.SortByImpl;
 import org.geotools.util.logging.Logging;
 import org.opengis.filter.Filter;
 import org.opengis.filter.FilterFactory2;
@@ -186,13 +185,11 @@ protected List<ExecutionStatus> getFilteredItems() {
 
         SortBy sortOrder = null;
         if (sort != null) {
-            SortBy[] sortBys = new SortByImpl[1];
             final Property<?> property = getProperty(sort);
             if (property.isSearchable()) { // we really need another flag
                 final String sortProperty = ((BeanProperty<StoreInfo>) property).getPropertyPath();
                 sortOrder = sortBy(sortProperty, sort.isAscending());
-                sortBys[0] = sortOrder;
+                query.setSortBy(new SortBy[] {sortOrder});
-                query.setSortBy(sortBys);
             }
         }
         LOGGER.fine("built query " + query + " to filter statuses");

diff --git a/...ension/wps/wps-core/src/main/java/org/geoserver/wps/executor/ProcessListenerNotifier.java b/...ension/wps/wps-core/src/main/java/org/geoserver/wps/executor/ProcessListenerNotifier.java
@@ -71,12 +71,12 @@ public void fireProgress(float progress, String task) {
             // By default we estimate the completion as:
             // "time elapsed millis / percentage completed"
             if (progress > 0) {
-                long timeEalpsedMillis =
+                long timeElapsedMillis =
                         (new Date().getTime() - status.getCreationTime().getTime());
                 int estimatedCompletionMillis =
                         (int)
-                                ((timeEalpsedMillis / progress) * timeEalpsedMillis
+                                ((timeElapsedMillis / progress) * timeElapsedMillis
-                                        + timeEalpsedMillis);
+                                        + timeElapsedMillis);
                 Calendar calendar = Calendar.getInstance();
                 calendar.setTime(status.getCreationTime());
                 calendar.add(Calendar.MILLISECOND, estimatedCompletionMillis);