You are viewing a plain text version of this content. The canonical link for it is here.
Posted to lokahi-commits@incubator.apache.org by to...@apache.org on 2006/06/30 19:10:47 UTC
svn commit: r418362 - in /incubator/lokahi/lokahi/trunk/src:
java/org/apache/lokahi/core/api/file/FileModel.java
java/org/apache/lokahi/core/api/job/Job.java www/Help/update.vm
Author: toback
Date: Fri Jun 30 12:10:47 2006
New Revision: 418362
URL: http://svn.apache.org/viewvc?rev=418362&view=rev
Log:
fixed the improper arg order in job/Job.java
Modified:
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/FileModel.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/job/Job.java
incubator/lokahi/lokahi/trunk/src/www/Help/update.vm
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/FileModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/FileModel.java?rev=418362&r1=418361&r2=418362&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/FileModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/FileModel.java Fri Jun 30 12:10:47 2006
@@ -64,7 +64,7 @@
public void updateFile(User u, File fi, Function f) throws AuthorizationException, TMCIllegalArgumentException, SQLException, IOException {
this.jpInit(f, u, fi.getName());
if (u.isAllowed(f) && "UpdateFile".equals(f.getCommand())) {
- if (fi.getPk() > 1 && fi.getName() != null && !"".equals(fi.getName())) {
+ if (fi.getPk() >= 1 && fi.getName() != null && !"".equals(fi.getName())) {
File.update(fi);
} else {
throw new TMCIllegalArgumentException("File can not be null");
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/job/Job.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/job/Job.java?rev=418362&r1=418361&r2=418362&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/job/Job.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/job/Job.java Fri Jun 30 12:10:47 2006
@@ -615,7 +615,7 @@
args = new String[]{url, namespace, method}; //no ATTACHMENT!
// ret = this.sendRequestNoAttachment(); // null - parent
}
- }
+ } //todo is it possible for the parentJob to be equal to null?
try {
if (logger.isDebugEnabled()) {
logger.debug("args=" + args);
@@ -626,7 +626,7 @@
if (logger.isDebugEnabled()) {
logger.debug("Are we even getting to this point?");
}
- ret = m.send(params, hasAttach, args);
+ ret = m.send(args, hasAttach, params);
}
} catch (UnsupportedParameterException e) {
if (logger.isInfoEnabled()) {
Modified: incubator/lokahi/lokahi/trunk/src/www/Help/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/update.vm?rev=418362&r1=418361&r2=418362&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/update.vm Fri Jun 30 12:10:47 2006
@@ -135,6 +135,7 @@
</td>
</tr>
</table>
+<input type="hidden" name="id" value="$!{id}">
<input type="hidden" name="methodToCall" value="UpdateHelpItem">
<input type="submit" value="submit">
</form>