[teiid-commits] teiid SVN: r2817 - in branches/7.1.x: client/src/main/java/org/teiid/adminapi/impl and 2 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Tue Jan 4 17:16:41 EST 2011
Author: shawkins
Date: 2011-01-04 17:16:41 -0500 (Tue, 04 Jan 2011)
New Revision: 2817
Modified:
branches/7.1.x/client/src/main/java/org/teiid/adminapi/Transaction.java
branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/TransactionMetadata.java
branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/TransactionMetadataMapper.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java
branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java
Log:
TEIID-1420 fixing getTransactions
Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/Transaction.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/adminapi/Transaction.java 2011-01-04 22:14:35 UTC (rev 2816)
+++ branches/7.1.x/client/src/main/java/org/teiid/adminapi/Transaction.java 2011-01-04 22:16:41 UTC (rev 2817)
@@ -30,7 +30,7 @@
* May be null for an unassociated Global transaction.
* @return
*/
- long getAssociatedSession();
+ String getAssociatedSession();
/**
* Get the scope for the transaction. Will be one of GLOBAL, LOCAL, or REQUEST
Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/TransactionMetadata.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/TransactionMetadata.java 2011-01-04 22:14:35 UTC (rev 2816)
+++ branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/TransactionMetadata.java 2011-01-04 22:16:41 UTC (rev 2817)
@@ -33,18 +33,18 @@
public class TransactionMetadata extends AdminObjectImpl implements Transaction {
private static final long serialVersionUID = -8588785315218789068L;
- private long associatedSession;
+ private String associatedSession;
private String scope;
private String id;
private long createdTime;
@Override
@ManagementProperty(description="Session ID", readOnly=true)
- public long getAssociatedSession() {
+ public String getAssociatedSession() {
return associatedSession;
}
- public void setAssociatedSession(long associatedSession) {
+ public void setAssociatedSession(String associatedSession) {
this.associatedSession = associatedSession;
}
Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/TransactionMetadataMapper.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/TransactionMetadataMapper.java 2011-01-04 22:14:35 UTC (rev 2816)
+++ branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/TransactionMetadataMapper.java 2011-01-04 22:16:41 UTC (rev 2817)
@@ -45,7 +45,7 @@
static {
metaType = new MutableCompositeMetaType(TransactionMetadata.class.getName(), "The Transaction domain meta data"); //$NON-NLS-1$
- metaType.addItem(ASSOCIATED_SESSION, ASSOCIATED_SESSION, SimpleMetaType.LONG_PRIMITIVE);
+ metaType.addItem(ASSOCIATED_SESSION, ASSOCIATED_SESSION, SimpleMetaType.STRING);
metaType.addItem(CREATED_TIME, CREATED_TIME, SimpleMetaType.LONG_PRIMITIVE);
metaType.addItem(SCOPE, SCOPE, SimpleMetaType.STRING);
metaType.addItem(XID, XID, SimpleMetaType.STRING);
@@ -89,7 +89,7 @@
CompositeValue compositeValue = (CompositeValue) metaValue;
TransactionMetadata transaction = new TransactionMetadata();
- transaction.setAssociatedSession((Long) metaValueFactory.unwrap(compositeValue.get(ASSOCIATED_SESSION)));
+ transaction.setAssociatedSession((String) metaValueFactory.unwrap(compositeValue.get(ASSOCIATED_SESSION)));
transaction.setCreatedTime((Long) metaValueFactory.unwrap(compositeValue.get(CREATED_TIME)));
transaction.setScope((String) metaValueFactory.unwrap(compositeValue.get(SCOPE)));
transaction.setId((String) metaValueFactory.unwrap(compositeValue.get("id"))); //$NON-NLS-1$
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java 2011-01-04 22:14:35 UTC (rev 2816)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java 2011-01-04 22:16:41 UTC (rev 2817)
@@ -517,7 +517,7 @@
continue;
}
TransactionMetadata txnImpl = new TransactionMetadata();
- txnImpl.setAssociatedSession(Long.parseLong(transactionContext.getThreadId()));
+ txnImpl.setAssociatedSession(transactionContext.getThreadId());
txnImpl.setCreatedTime(transactionContext.getCreationTime());
txnImpl.setScope(transactionContext.getTransactionType().toString());
txnImpl.setId(transactionContext.getTransactionId());
Modified: branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java
===================================================================
--- branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java 2011-01-04 22:14:35 UTC (rev 2816)
+++ branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestTransactionServer.java 2011-01-04 22:16:41 UTC (rev 2817)
@@ -45,8 +45,8 @@
private TransactionManager tm;
private javax.transaction.Transaction txn;
- private static final String THREAD1 = "1"; //$NON-NLS-1$
- private static final String THREAD2 = "2"; //$NON-NLS-1$
+ private static final String THREAD1 = "abc1"; //$NON-NLS-1$
+ private static final String THREAD2 = "abc2"; //$NON-NLS-1$
private static final XidImpl XID1 = new XidImpl(0, new byte[] {
1
@@ -167,7 +167,7 @@
try {
server.commit(THREAD1);
} catch (XATransactionException e) {
- assertEquals("No transaction found for client 1.", e.getMessage()); //$NON-NLS-1$
+ assertEquals("No transaction found for client abc1.", e.getMessage()); //$NON-NLS-1$
}
}
@@ -187,7 +187,7 @@
try {
server.rollback(THREAD1);
} catch (XATransactionException e) {
- assertEquals("No transaction found for client 1.", e.getMessage()); //$NON-NLS-1$
+ assertEquals("No transaction found for client abc1.", e.getMessage()); //$NON-NLS-1$
}
}
@@ -225,7 +225,7 @@
server.start(THREAD2, XID1, XAResource.TMRESUME, 100,false);
fail("exception expected"); //$NON-NLS-1$
} catch (XATransactionException ex) {
- assertEquals("Cannot resume, transaction Teiid-Xid global:1 branch:null format:0 was not suspended by client 2.", ex.getMessage()); //$NON-NLS-1$
+ assertEquals("Cannot resume, transaction Teiid-Xid global:1 branch:null format:0 was not suspended by client abc2.", ex.getMessage()); //$NON-NLS-1$
}
}
@@ -273,7 +273,7 @@
assertEquals(1, server.getTransactions().size());
Transaction t = server.getTransactions().iterator().next();
- assertEquals(Long.parseLong(THREAD1), t.getAssociatedSession());
+ assertEquals(THREAD1, t.getAssociatedSession());
assertNotNull(t.getId());
}
More information about the teiid-commits
mailing list