From a4c64329516e7b351cfbd82307605743e3ac730a Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Thu, 9 Oct 2014 15:08:57 +0200
Subject: Nesseccary cast from int to String for contentOperatingSystem from
 db.

---
 src/main/java/org/openslx/satellitedaemon/db/DbImage.java             | 4 ++--
 .../org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/openslx/satellitedaemon/db/DbImage.java b/src/main/java/org/openslx/satellitedaemon/db/DbImage.java
index 61c753a..e34a2ca 100644
--- a/src/main/java/org/openslx/satellitedaemon/db/DbImage.java
+++ b/src/main/java/org/openslx/satellitedaemon/db/DbImage.java
@@ -17,7 +17,7 @@ public class DbImage
 	public final long fileSize;
 	public final long changeTime;
 	public final long createTime;
-	public final String contentOperatingSystem;
+	public final int contentOperatingSystem;
 	public final boolean isValid;
 	public final boolean isDeleted;
 
@@ -28,7 +28,7 @@ public class DbImage
 
 	public DbImage(
 			String guid, String name, Integer rid, String path, String creator,
-			Long fileSize, Long createTime, Long changeTime, String contentOperatingSystem,
+			Long fileSize, Long createTime, Long changeTime, Integer contentOperatingSystem,
 			Boolean isValid, Boolean isDeleted)
 	{
 		if ( rid == null )
diff --git a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java
index 156414d..c4d6ddf 100644
--- a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java
+++ b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java
@@ -32,7 +32,7 @@ public class FileUploadWorker implements Runnable
 				ImageData imDat = new ImageData(
 						image.guid, image.rid,
 						image.name, image.createTime, image.changeTime, image.creator,
-						image.contentOperatingSystem, image.isValid, image.isDeleted, "best", image.fileSize );
+						String.valueOf( image.contentOperatingSystem), image.isValid, image.isDeleted, "best", image.fileSize );
 
 				String path = Globals.getImageFolder() + "/" + image.path;
 
-- 
cgit v1.2.3-55-g7522