You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/06/21 19:20:10 UTC
svn commit: r549556 -
/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
Author: agilliland
Date: Thu Jun 21 10:20:09 2007
New Revision: 549556
URL: http://svn.apache.org/viewvc?view=rev&rev=549556
Log:
protect install method against accidental refreshes or malicious users trying to force install work when it's not appropriate.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java?view=diff&rev=549556&r1=549555&r2=549556
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java Thu Jun 21 10:20:09 2007
@@ -62,7 +62,11 @@
public String execute() {
-
+
+ if(RollerFactory.isBootstrapped()) {
+ return SUCCESS;
+ }
+
if(WebloggerStartup.getDatabaseProviderException() != null) {
StartupException se = WebloggerStartup.getDatabaseProviderException();
if (se.getRootCause() != null) {
@@ -91,6 +95,10 @@
public String create() {
+ if(RollerFactory.isBootstrapped()) {
+ return SUCCESS;
+ }
+
try {
messages = WebloggerStartup.createDatabase();
@@ -106,6 +114,10 @@
public String upgrade() {
+ if(RollerFactory.isBootstrapped()) {
+ return SUCCESS;
+ }
+
try {
messages = WebloggerStartup.upgradeDatabase(true);
@@ -120,6 +132,10 @@
public String bootstrap() {
+
+ if(RollerFactory.isBootstrapped()) {
+ return SUCCESS;
+ }
try {
// trigger bootstrapping process