summaryrefslogtreecommitdiffstats
path: root/dozentenmodulserver/src
diff options
context:
space:
mode:
authorNino Breuer2014-11-24 15:23:29 +0100
committerNino Breuer2014-11-24 15:23:29 +0100
commitb7a385f41b1d3acebed1e64ae92fb6c873cd5ace (patch)
tree5145286dddd5e63ba899477d2b164500f32a738f /dozentenmodulserver/src
parent• started changing the authentification (diff)
parent• Some changes in text after feedback from Admins (diff)
downloadtutor-module-b7a385f41b1d3acebed1e64ae92fb6c873cd5ace.tar.gz
tutor-module-b7a385f41b1d3acebed1e64ae92fb6c873cd5ace.tar.xz
tutor-module-b7a385f41b1d3acebed1e64ae92fb6c873cd5ace.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodulserver/src')
-rw-r--r--dozentenmodulserver/src/main/java/sql/SQL.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java
index 2d038732..d496489d 100644
--- a/dozentenmodulserver/src/main/java/sql/SQL.java
+++ b/dozentenmodulserver/src/main/java/sql/SQL.java
@@ -833,7 +833,7 @@ public class SQL {
Connection con = getConnection();
Statement stm = con.createStatement();
ResultSet rs = stm
- .executeQuery("SELECT name, architecture FROM bwLehrpool.m_operatingSystem;");
+ .executeQuery("SELECT name, architecture FROM bwLehrpool.m_operatingSystem ORDER BY name, architecture;");
while (rs.next()) {
list.add(rs.getString("name") + " "
+ rs.getString("architecture") + " bit");