java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
| 3 ++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java
| 6 ++++--
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
| 3 ++-
3 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit d5d12d4876390d0f29524eea1862927542ba7cc0
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Mon Sep 20 13:14:13 2010 +0200
various checkstyle fixes for previous commit
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
index b82a67e..3a2097d 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
@@ -248,7 +248,8 @@ public class ConfigChannelHandler extends BaseHandler {
* #prop_desc("string","contents",
* "Contents of the file (text or base64 encoded if binary).
* (ignored for directories)")
- * #prop_desc("boolean","contents_enc64", "Identifies
base64 encoded content (default: disabled).")
+ * #prop_desc("boolean","contents_enc64", "Identifies
base64 encoded content
+ * (default: disabled).")
* #prop_desc("string", "owner", "Owner of the
file/directory.")
* #prop_desc("string", "group", "Group name of the
file/directory.")
* #prop_desc("string", "permissions",
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java
index c7c004a..225b981 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java
@@ -117,8 +117,10 @@ public class XmlRpcConfigChannelHelper {
String content = (String)data.get(ConfigRevisionSerializer.CONTENTS);
if (data.containsKey(ConfigRevisionSerializer.CONTENTS_ENC64)) {
try {
- content = new
String(Base64.decodeBase64(content.getBytes("UTF-8")), "UTF-8");
- } catch (UnsupportedEncodingException e) {
+ content = new
String(Base64.decodeBase64(content.getBytes("UTF-8")),
+ "UTF-8");
+ }
+ catch (UnsupportedEncodingException e) {
String msg = "Following errors were encountered " +
"when creating the config file.\n" +
e.getMessage();
throw new FaultException(1023, "ConfgFileError", msg);
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
index bee673d..ff967f2 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
@@ -133,7 +133,8 @@ public class ServerConfigHandler extends BaseHandler {
* #prop_desc("string","contents",
* "Contents of the file (text or base64 encoded if binary).
* (ignored for directories)")
- * #prop_desc("boolean","contents_enc64", "Identifies
base64 encoded content (default: disabled).")
+ * #prop_desc("boolean","contents_enc64", "Identifies
base64 encoded content
+ * (default: disabled).")
* #prop_desc("string","owner", "Owner of the
file/directory.")
* #prop_desc("string","group", "Group name of the
file/directory.")
* #prop_desc("string","permissions",
Show replies by date