java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java | 9 ++++-----
java/code/src/com/redhat/rhn/domain/config/ConfigContent.java | 3 ++-
java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java | 6 ++++--
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 3 ++-
4 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 4eb7cd49937c99919dbc6dc4ba71c99aaaa8a9cf
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Aug 3 14:37:45 2010 -0400
Fixed byte[] -> string conversion bugs that were created during the blob->binary
commit
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
b/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
index b78ba13..bf7ff61 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
@@ -490,7 +490,7 @@ public abstract class HibernateFactory {
*/
public static String getByteArrayContents(byte[] barr) {
- String retval = null;
+ String retval = "";
if (barr != null) {
try {
@@ -527,18 +527,18 @@ public abstract class HibernateFactory {
}
/**
- * Convert a String to a Blob object. Guards against
+ * Convert a String to a byte[] object. Guards against
* null arrays and 0 length arrays.
* @param data string to convert to a Blob
* @return Blob if data[] is non-null and length > 0, null otherwise
*/
- public static Blob stringToBlob(String data) {
+ public static byte[] stringToByteArray(String data) {
if (StringUtils.isEmpty(data)) {
return null;
}
try {
- return byteArrayToBlob(data.getBytes("UTF-8"));
+ return data.getBytes("UTF-8");
}
catch (UnsupportedEncodingException e) {
throw new RuntimeException("Illegal Argument: " +
@@ -547,7 +547,6 @@ public abstract class HibernateFactory {
}
}
-
/**
* Initialize the underlying db layer
*
diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigContent.java
b/java/code/src/com/redhat/rhn/domain/config/ConfigContent.java
index 12dd796..e0e5adb 100644
--- a/java/code/src/com/redhat/rhn/domain/config/ConfigContent.java
+++ b/java/code/src/com/redhat/rhn/domain/config/ConfigContent.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.domain.config;
+import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.domain.BaseDomainHelper;
import com.redhat.rhn.domain.common.Checksum;
@@ -77,7 +78,7 @@ public class ConfigContent extends BaseDomainHelper {
* @return String version of the Contents content
*/
public String getContentsString() {
- return new String(contents);
+ return HibernateFactory.getByteArrayContents(getContents());
}
diff --git a/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java
b/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java
index 96916b4..c88f32b 100644
--- a/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java
+++ b/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.domain.server;
+import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.domain.rhnpackage.PackageEvr;
import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory;
@@ -43,7 +44,7 @@ public class SatelliteServer extends Server {
*/
public String getCertString() {
if (cert != null) {
- return new String(cert);
+ return HibernateFactory.getByteArrayContents(cert);
}
return null;
}
@@ -60,7 +61,7 @@ public class SatelliteServer extends Server {
* @param aCert The cert to set.
*/
public void setCert(String aCert) {
- cert = aCert.getBytes();
+ cert = HibernateFactory.stringToByteArray(aCert);
}
/**
@@ -152,6 +153,7 @@ public class SatelliteServer extends Server {
/**
* {@inheritDoc}
*/
+ @Override
public boolean isSatellite() {
return true;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
index dbdf278..ee24588 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
@@ -91,6 +91,7 @@ public class DownloadFile extends DownloadAction {
private static final String CHANNEL = "cid";
/** {@inheritDoc} */
+ @Override
public ActionForward execute(ActionMapping mapping,
ActionForm formIn,
HttpServletRequest request,
@@ -589,7 +590,7 @@ public class DownloadFile extends DownloadAction {
if (!f.exists()) {
log.error("manualServeChecksum :: File not found: " +
diskPath);
response.sendError(HttpServletResponse.SC_NOT_FOUND);
- return getStreamForText("".getBytes());
+ return getStreamForText(new byte[0]);
}
checksum = MD5Sum.getFileMD5Sum(f);
}
Show replies by date