diff options
| author | Björn Hagemeister | 2014-10-09 15:08:57 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-10-09 15:08:57 +0200 |
| commit | a4c64329516e7b351cfbd82307605743e3ac730a (patch) | |
| tree | e66b2cbb57c4eebdd3fea434e1c834156d49f01b | |
| parent | Added status status_isValid and status_isDeleted from db to DbImage. (diff) | |
| download | satellite-daemon-a4c64329516e7b351cfbd82307605743e3ac730a.tar.gz satellite-daemon-a4c64329516e7b351cfbd82307605743e3ac730a.tar.xz satellite-daemon-a4c64329516e7b351cfbd82307605743e3ac730a.zip | |
Nesseccary cast from int to String for contentOperatingSystem from db.
| -rw-r--r-- | src/main/java/org/openslx/satellitedaemon/db/DbImage.java | 4 | ||||
| -rw-r--r-- | src/main/java/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; |