Author: coheigea
Date: Thu Oct 11 10:46:24 2012
New Revision: 1396982
URL: http://svn.apache.org/viewvc?rev=1396982&view=rev
Log:
Merged revisions 1396980 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1396980 | coheigea | 2012-10-11 11:40:12 +0100 (Thu, 11 Oct 2012) | 2 lines
Backmerging specific fix
........
Modified:
cxf/branches/2.5.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngineConfigurator.java
Modified:
cxf/branches/2.5.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngineConfigurator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngineConfigurator.java?rev=1396982&r1=1396981&r2=1396982&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngineConfigurator.java
(original)
+++
cxf/branches/2.5.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngineConfigurator.java
Thu Oct 11 10:46:24 2012
@@ -201,7 +201,7 @@ final class AtomPushEngineConfigurator {
}
private <T extends Enum<T>> T parseEnum(String value, T defaultValue,
Class<T> enumClass) {
- if (value == null | "".equals(value)) {
+ if (value == null || "".equals(value)) {
return defaultValue;
}
try {
