Commit ca2443cb authored by Matt Tucker's avatar Matt Tucker Committed by matt

Removed workgroup code.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@346 b35dd754-fafc-0310-a699-88a17e54d16e
parent 30973cea
...@@ -59,9 +59,6 @@ public class SequenceManager { ...@@ -59,9 +59,6 @@ public class SequenceManager {
new SequenceManager(JiveConstants.GROUP, 1); new SequenceManager(JiveConstants.GROUP, 1);
new SequenceManager(JiveConstants.ROSTER, 5); new SequenceManager(JiveConstants.ROSTER, 5);
new SequenceManager(JiveConstants.OFFLINE, 1); new SequenceManager(JiveConstants.OFFLINE, 1);
new SequenceManager(JiveConstants.WORKGROUP_AGENT, 1);
new SequenceManager(JiveConstants.WORKGROUP_GROUP, 1);
new SequenceManager(JiveConstants.WORKGROUP_QUEUE, 1);
new SequenceManager(JiveConstants.MUC_ROOM, 1); new SequenceManager(JiveConstants.MUC_ROOM, 1);
} }
...@@ -145,6 +142,7 @@ public class SequenceManager { ...@@ -145,6 +142,7 @@ public class SequenceManager {
"jiveID table may not be correctly populated."); "jiveID table may not be correctly populated.");
} }
long currentID = rs.getLong(1); long currentID = rs.getLong(1);
rs.close();
pstmt.close(); pstmt.close();
// Increment the id to define our block. // Increment the id to define our block.
...@@ -170,14 +168,8 @@ public class SequenceManager { ...@@ -170,14 +168,8 @@ public class SequenceManager {
abortTransaction = true; abortTransaction = true;
} }
finally { finally {
try { try { if (pstmt != null) { pstmt.close(); } }
if (pstmt != null) { catch (Exception e) { Log.error(e); }
pstmt.close();
}
}
catch (Exception e) {
Log.error(e);
}
DbConnectionManager.closeTransactionConnection(con, abortTransaction); DbConnectionManager.closeTransactionConnection(con, abortTransaction);
} }
......
...@@ -22,9 +22,6 @@ public class JiveConstants { ...@@ -22,9 +22,6 @@ public class JiveConstants {
public static final int SYSTEM = 17; public static final int SYSTEM = 17;
public static final int ROSTER = 18; public static final int ROSTER = 18;
public static final int OFFLINE = 19; public static final int OFFLINE = 19;
public static final int WORKGROUP_AGENT = 20;
public static final int WORKGROUP_QUEUE = 21;
public static final int WORKGROUP_GROUP = 22;
public static final int MUC_ROOM = 23; public static final int MUC_ROOM = 23;
public static final long SECOND = 1000; public static final long SECOND = 1000;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment