Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
adapt
ace
Commits
478d663a
Commit
478d663a
authored
Jan 29, 2016
by
Michael Ritter
Browse files
Increment and decrement the collection counter on add/delete
parent
9ad490b9
Changes
2
Hide whitespace changes
Inline
Side-by-side
ace-am/src/main/java/edu/umiacs/ace/monitor/core/ManageCollectionServlet.java
View file @
478d663a
...
...
@@ -30,15 +30,14 @@
// $Id$
package
edu.umiacs.ace.monitor.core
;
import
edu.umiacs.ace.util.EntityManagerServlet
;
import
edu.umiacs.ace.util.PersistUtil
;
import
edu.umiacs.ace.driver.StorageDriver
;
import
edu.umiacs.ace.driver.StorageDriverFactory
;
import
edu.umiacs.ace.monitor.access.CollectionCountContext
;
import
edu.umiacs.ace.util.EntityManagerServlet
;
import
edu.umiacs.ace.util.PersistUtil
;
import
edu.umiacs.util.Strings
;
import
java.io.IOException
;
import
java.security.MessageDigest
;
import
java.security.NoSuchAlgorithmException
;
import
java.util.HashMap
;
import
org.apache.log4j.Logger
;
import
javax.persistence.EntityManager
;
import
javax.persistence.EntityTransaction
;
import
javax.persistence.Query
;
...
...
@@ -47,7 +46,10 @@ import javax.servlet.ServletException;
import
javax.servlet.ServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
org.apache.log4j.Logger
;
import
java.io.IOException
;
import
java.security.MessageDigest
;
import
java.security.NoSuchAlgorithmException
;
import
java.util.HashMap
;
/**
* add,modify,remove the settings of a collection
...
...
@@ -154,6 +156,7 @@ public class ManageCollectionServlet extends EntityManagerServlet {
PersistUtil
.
persist
(
collection
);
storage
=
StorageDriverFactory
.
createStorageAccess
(
collection
,
em
);
CollectionCountContext
.
incrementTotalCollections
();
}
dispatcher
=
request
.
getRequestDispatcher
(
"collectionmodify.jsp"
);
...
...
@@ -206,6 +209,7 @@ public class ManageCollectionServlet extends EntityManagerServlet {
storage
.
remove
(
em
);
}
em
.
remove
(
collection
);
CollectionCountContext
.
decrementTotalCollections
();
trans
.
commit
();
}
...
...
ace-am/src/main/java/edu/umiacs/ace/rest/CollectionManagement.java
View file @
478d663a
...
...
@@ -7,6 +7,7 @@ package edu.umiacs.ace.rest;
import
edu.umiacs.ace.driver.StorageDriver
;
import
edu.umiacs.ace.driver.StorageDriverFactory
;
import
edu.umiacs.ace.monitor.access.CollectionCountContext
;
import
edu.umiacs.ace.monitor.audit.AuditThreadFactory
;
import
edu.umiacs.ace.monitor.core.Collection
;
import
edu.umiacs.ace.monitor.core.MonitoredItem
;
...
...
@@ -150,6 +151,7 @@ public class CollectionManagement {
EntityTransaction
trans
=
em
.
getTransaction
();
trans
.
begin
();
em
.
persist
(
coll
);
CollectionCountContext
.
incrementTotalCollections
();
trans
.
commit
();
em
.
close
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment