diff --git a/cat-agent/pom.xml b/cat-agent/pom.xml
index 81355b980e82b23a4cb435827b14c3392d61c450..c82af82061bbc6281245a9e82cda6ba5041dc772 100644
--- a/cat-agent/pom.xml
+++ b/cat-agent/pom.xml
@@ -3,7 +3,7 @@
com.dianping.cat
parent
- 1.1.3
+ 1.1.4
4.0.0
cat-agent
diff --git a/cat-broker/pom.xml b/cat-broker/pom.xml
index 10409095e6c8549e948a9580c30a2ffc33400a81..a8ed7104cd2e54ec60bda32ec00c660c11650aec 100755
--- a/cat-broker/pom.xml
+++ b/cat-broker/pom.xml
@@ -4,7 +4,7 @@
com.dianping.cat
parent
- 1.1.3
+ 1.1.4
4.0.0
broker-service
diff --git a/cat-client/pom.xml b/cat-client/pom.xml
index 7f50d0a50de2b6f482c69a43322a57f98de9c66e..8af7f94300f7857b58ab838d256993f69d28dc11 100644
--- a/cat-client/pom.xml
+++ b/cat-client/pom.xml
@@ -4,7 +4,7 @@
com.dianping.cat
parent
- 1.1.3
+ 1.1.4
4.0.0
cat-client
diff --git a/cat-client/src/main/java/com/dianping/cat/servlet/CatFilter.java b/cat-client/src/main/java/com/dianping/cat/servlet/CatFilter.java
index c55aac74668f4638859df4146b95efb3e37e89b9..d8eac11e2a707ac53ddf3da2710a12507b52f71b 100644
--- a/cat-client/src/main/java/com/dianping/cat/servlet/CatFilter.java
+++ b/cat-client/src/main/java/com/dianping/cat/servlet/CatFilter.java
@@ -272,6 +272,7 @@ public class CatFilter implements Filter {
private void customizeStatus(Transaction t, HttpServletRequest req) {
Object catStatus = req.getAttribute(CatConstants.CAT_STATE);
+
if (catStatus != null) {
t.setStatus(catStatus.toString());
} else {
@@ -281,6 +282,7 @@ public class CatFilter implements Filter {
private void customizeUri(Transaction t, HttpServletRequest req) {
Object catPageUri = req.getAttribute(CatConstants.CAT_PAGE_URI);
+
if (t instanceof DefaultTransaction && catPageUri instanceof String) {
((DefaultTransaction) t).setName(catPageUri.toString());
}
diff --git a/cat-consumer-advanced/pom.xml b/cat-consumer-advanced/pom.xml
index f5bc577351ba063749c2cdbd6166f19f9112ca3d..4f1e6f7963ece66d9b0ce26731df4f1339d2580d 100644
--- a/cat-consumer-advanced/pom.xml
+++ b/cat-consumer-advanced/pom.xml
@@ -4,7 +4,7 @@
com.dianping.cat
parent
- 1.1.3
+ 1.1.4
4.0.0
cat-consumer-advanced
diff --git a/cat-consumer/pom.xml b/cat-consumer/pom.xml
index c1f3377a1ccd389250cdd279f41bf7d27b025521..17a927f482753517b58edf211dee0f44cb2e5cad 100644
--- a/cat-consumer/pom.xml
+++ b/cat-consumer/pom.xml
@@ -3,7 +3,7 @@
com.dianping.cat
parent
- 1.1.3
+ 1.1.4
4.0.0
cat-consumer
diff --git a/cat-core/pom.xml b/cat-core/pom.xml
index 5784cc997fbd022449a12ed75ad892c813ed48f1..b406753dc4c1feb8025a10bbfa3aba426ded81ad 100644
--- a/cat-core/pom.xml
+++ b/cat-core/pom.xml
@@ -3,7 +3,7 @@
com.dianping.cat
parent
- 1.1.3
+ 1.1.4
4.0.0
cat-core
diff --git a/cat-hadoop/pom.xml b/cat-hadoop/pom.xml
index 3be7937a7c15549acd63cba58a657df53ec21af4..2164f8bc4bfeb41561f208ae8432a06f2653fce9 100644
--- a/cat-hadoop/pom.xml
+++ b/cat-hadoop/pom.xml
@@ -4,7 +4,7 @@
com.dianping.cat
parent
- 1.1.3
+ 1.1.4
4.0.0
cat-hadoop
diff --git a/cat-home/pom.xml b/cat-home/pom.xml
index fb160dfd526fc3903767329f251398e44c5beb95..6b014ec8974e63ec3c9e39ff12a3a167f37070bb 100755
--- a/cat-home/pom.xml
+++ b/cat-home/pom.xml
@@ -4,7 +4,7 @@
com.dianping.cat
parent
- 1.1.3
+ 1.1.4
4.0.0
cat-home
diff --git a/cat-home/src/main/webapp/css/body.css b/cat-home/src/main/webapp/css/body.css
index c23b07a2c9dcd3a52676c8e3b44cfb43d4f74baf..372a5435ec9050657c80360a5cb13196c939cddf 100755
--- a/cat-home/src/main/webapp/css/body.css
+++ b/cat-home/src/main/webapp/css/body.css
@@ -270,4 +270,8 @@ ul, ol{
}
.aleration_workflow{
background:#87CEEB;
+}
+.table-condensed th, .table-condensed td{
+padding: 2px 3px;
+vertical-align:middle;
}
\ No newline at end of file
diff --git a/cat-maven-plugin/pom.xml b/cat-maven-plugin/pom.xml
index e33693eb9c17f9a9f673d1b7191df2e2c64b1110..73c6797c2f7ae05a0c2f551aa6c10f0d5d240c7f 100644
--- a/cat-maven-plugin/pom.xml
+++ b/cat-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
com.dianping.cat
parent
- 1.1.3
+ 1.1.4
4.0.0
cat-maven-plugin
diff --git a/pom.xml b/pom.xml
index 76c92d90f37e455a2ed69d8a6d4ef2face44263b..e8006f6dfa4bd91823cc7422acba7818c3da1262 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
com.dianping.cat
parent
- 1.1.3
+ 1.1.4
parent
Central Application Tracking
pom
@@ -179,7 +179,7 @@ org.eclipse.jdt.core.compiler.compliance=1.6
com.dianping.cat
cat-maven-plugin
- 1.1.3
+ 1.1.4